From f21735b5780fa29e47c6605bcb0b7d55894f442a Mon Sep 17 00:00:00 2001
From: Michael Neale <michael.neale@gmail.com>
Date: Tue, 16 Jun 2026 13:13:24 +1000
Subject: [PATCH] Fix serverless merge formatting

---
 desktop/scripts/check-file-sizes.mjs          |   3 +-
 desktop/src/app/AppShell.tsx                  | 455 +++++++++---------
 .../src/features/sidebar/ui/AppSidebar.tsx    |  84 ++--
 .../features/workspaces/ui/WelcomeSetup.tsx   |   5 +-
 4 files changed, 281 insertions(+), 266 deletions(-)

diff --git a/desktop/scripts/check-file-sizes.mjs b/desktop/scripts/check-file-sizes.mjs
index 57a0b2bc93..8ff3267f5b 100644
--- a/desktop/scripts/check-file-sizes.mjs
+++ b/desktop/scripts/check-file-sizes.mjs
@@ -40,7 +40,8 @@ const overrides = new Map([
   ["src-tauri/src/nostr_convert.rs", 1126],
   ["src/shared/api/relayClientSession.ts", 1160],
   ["src-tauri/src/migration.rs", 1295],
-  ["src-tauri/src/events.rs", 1150],
+  ["src-tauri/src/events.rs", 1200],
+  ["src/app/AppShell.tsx", 1020],
 ]);
 
 await runFileSizeCheck({
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index 34f5b31d66..00fd3059d9 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -757,238 +757,249 @@ export function AppShell() {
           }}
         >
           <ServerlessProvider serverless={serverless}>
-          <HuddleProvider>
-            <div
-              className="buzz-huddle-shell relative h-dvh overflow-hidden overscroll-none"
-              data-huddle-open={isHuddleDrawerOpen}
-            >
+            <HuddleProvider>
               <div
-                className={cn(
-                  "buzz-huddle-app-surface z-10 flex min-h-0 flex-col overflow-hidden bg-background",
-                  isHuddleDrawerOpen && "buzz-huddle-app-surface-open",
-                )}
+                className="buzz-huddle-shell relative h-dvh overflow-hidden overscroll-none"
+                data-huddle-open={isHuddleDrawerOpen}
               >
-                <SidebarProvider className="min-h-0 flex-1 overflow-hidden">
-                  {!settingsOpen ? (
-                    <AppTopChrome
-                      canGoBack={canGoBack}
-                      canGoForward={canGoForward}
+                <div
+                  className={cn(
+                    "buzz-huddle-app-surface z-10 flex min-h-0 flex-col overflow-hidden bg-background",
+                    isHuddleDrawerOpen && "buzz-huddle-app-surface-open",
+                  )}
+                >
+                  <SidebarProvider className="min-h-0 flex-1 overflow-hidden">
+                    {!settingsOpen ? (
+                      <AppTopChrome
+                        canGoBack={canGoBack}
+                        canGoForward={canGoForward}
+                        channels={channels}
+                        currentPubkey={identityQuery.data?.pubkey}
+                        onGoBack={goBack}
+                        onGoForward={goForward}
+                        onOpenChannel={(channelId) => {
+                          void goChannel(channelId);
+                        }}
+                        onOpenResult={handleOpenSearchResult}
+                        searchHidden={topbarSearchHidden}
+                        searchLoading={topbarSearchLoading}
+                        searchFocusRequest={searchFocusRequest}
+                      />
+                    ) : null}
+                    {settingsOpen ? (
+                      <React.Suspense fallback={null}>
+                        <LazySettingsScreen
+                          currentPubkey={identityQuery.data?.pubkey}
+                          fallbackDisplayName={identityQuery.data?.displayName}
+                          isUpdatingDesktopNotifications={
+                            notificationSettings.isUpdatingDesktopEnabled
+                          }
+                          notificationErrorMessage={
+                            notificationSettings.errorMessage
+                          }
+                          notificationPermission={
+                            notificationSettings.permission
+                          }
+                          notificationSettings={notificationSettings.settings}
+                          onClose={handleCloseSettings}
+                          onSectionChange={setSettingsSection}
+                          onSetDesktopNotificationsEnabled={
+                            notificationSettings.setDesktopEnabled
+                          }
+                          onSetHomeBadgeEnabled={
+                            notificationSettings.setHomeBadgeEnabled
+                          }
+                          onSetSlotAlertsEnabled={
+                            notificationSettings.setSlotAlertsEnabled
+                          }
+                          onSetNotifyWhileViewing={
+                            notificationSettings.setNotifyWhileViewing
+                          }
+                          onSetAllSlotAlertsEnabled={
+                            notificationSettings.setAllSlotAlertsEnabled
+                          }
+                          onSetSoundForSlot={
+                            notificationSettings.setSoundForSlot
+                          }
+                          section={settingsSection}
+                        />
+                      </React.Suspense>
+                    ) : (
+                      <>
+                        <AppSidebar
+                          activeWorkspace={workspacesHook.activeWorkspace}
+                          channels={sidebarChannels}
+                          currentPubkey={identityQuery.data?.pubkey}
+                          errorMessage={
+                            channelsQuery.error instanceof Error
+                              ? channelsQuery.error.message
+                              : undefined
+                          }
+                          fallbackDisplayName={identityQuery.data?.displayName}
+                          homeBadgeCount={homeBadgeCount}
+                          isAddWorkspaceOpen={isAddWorkspaceOpen}
+                          isCreatingChannel={createChannelMutation.isPending}
+                          isCreatingForum={createForumMutation.isPending}
+                          isLoading={channelsQuery.isLoading}
+                          isOpeningDm={openDmMutation.isPending}
+                          isNewDmOpen={isNewDmOpen}
+                          isCreateChannelOpen={isCreateChannelOpen}
+                          isPresencePending={presenceSession.isPending}
+                          onAddWorkspace={(workspace) => {
+                            const id = workspacesHook.addWorkspace(workspace);
+                            workspacesHook.switchWorkspace(id);
+                          }}
+                          onAddWorkspaceOpenChange={setIsAddWorkspaceOpen}
+                          onNewDmOpenChange={setIsNewDmOpen}
+                          onCreateChannelOpenChange={setIsCreateChannelOpen}
+                          onOpenAddWorkspace={() => setIsAddWorkspaceOpen(true)}
+                          onUpdateWorkspace={workspacesHook.updateWorkspace}
+                          onRemoveWorkspace={workspacesHook.removeWorkspace}
+                          onSwitchWorkspace={workspacesHook.switchWorkspace}
+                          selfPresenceStatus={presenceSession.currentStatus}
+                          workspaces={workspacesHook.workspaces}
+                          onCreateChannel={async ({
+                            description,
+                            name,
+                            visibility,
+                            ttlSeconds,
+                            templateId,
+                          }) => {
+                            const createdChannel =
+                              await createChannelMutation.mutateAsync({
+                                name,
+                                description,
+                                channelType: "stream",
+                                visibility,
+                                ttlSeconds,
+                              });
+
+                            await applyCanvas(
+                              templateId,
+                              createdChannel.id,
+                              name,
+                            );
+                            await goChannel(createdChannel.id);
+                            void applyAgents(templateId, createdChannel.id);
+                          }}
+                          onCreateForum={async ({
+                            description,
+                            name,
+                            visibility,
+                            ttlSeconds,
+                            templateId,
+                          }) => {
+                            const createdForum =
+                              await createForumMutation.mutateAsync({
+                                name,
+                                description,
+                                channelType: "forum",
+                                visibility,
+                                ttlSeconds,
+                              });
+
+                            await applyCanvas(
+                              templateId,
+                              createdForum.id,
+                              name,
+                            );
+                            await goChannel(createdForum.id);
+                            void applyAgents(templateId, createdForum.id);
+                          }}
+                          onHideDm={handleHideDm}
+                          onMarkAllChannelsRead={markAllChannelsRead}
+                          onMarkChannelRead={markChannelRead}
+                          onMarkChannelUnread={markChannelUnread}
+                          onOpenBrowseChannels={handleOpenBrowseChannels}
+                          onOpenBrowseForums={handleOpenBrowseForums}
+                          onOpenDm={async ({ pubkeys }) => {
+                            const directMessage =
+                              await openDmMutation.mutateAsync({
+                                pubkeys,
+                              });
+                            await goChannel(directMessage.id);
+                          }}
+                          onSelectAgents={() => void goAgents()}
+                          onSelectChannel={(channelId) =>
+                            void goChannel(channelId)
+                          }
+                          onSelectHome={() => void goHome()}
+                          onSelectProjects={() => void goProjects()}
+                          onSelectPulse={() => void goPulse()}
+                          onSelectSettings={handleOpenSettings}
+                          onSelectWorkflows={() => void goWorkflows()}
+                          onSetPresenceStatus={(status) =>
+                            presenceSession.setStatus(status)
+                          }
+                          onSetUserStatus={(text, emoji) =>
+                            setUserStatusMutation.mutate({ text, emoji })
+                          }
+                          onClearUserStatus={() =>
+                            setUserStatusMutation.mutate({
+                              text: "",
+                              emoji: "",
+                            })
+                          }
+                          profile={profileQuery.data}
+                          selfUserStatus={
+                            deferredPubkey
+                              ? (selfStatusQuery.data?.[
+                                  deferredPubkey.toLowerCase()
+                                ] ?? undefined)
+                              : undefined
+                          }
+                          selectedChannelId={selectedChannelId}
+                          selectedView={selectedView}
+                          unreadChannelIds={unreadChannelIds}
+                          mutedChannelIds={mutedChannelIds}
+                          onMuteChannel={muteChannel}
+                          onUnmuteChannel={unmuteChannel}
+                          starredChannelIds={starredChannelIds}
+                          onStarChannel={starChannel}
+                          onUnstarChannel={unstarChannel}
+                        />
+
+                        <MainInsetProvider mainInsetRef={mainInsetRef}>
+                          <SidebarInset
+                            ref={mainInsetRef}
+                            className="min-h-0 min-w-0 overflow-hidden"
+                            style={chromeCssVarDefaults}
+                          >
+                            <ConnectionBanner />
+                            <Outlet />
+                          </SidebarInset>
+                        </MainInsetProvider>
+                      </>
+                    )}
+
+                    <AppShellOverlays
+                      activeChannel={activeChannel}
+                      browseDialogType={browseDialogType}
                       channels={channels}
                       currentPubkey={identityQuery.data?.pubkey}
-                      onGoBack={goBack}
-                      onGoForward={goForward}
-                      onOpenChannel={(channelId) => {
+                      isChannelManagementOpen={isChannelManagementOpen}
+                      onBrowseChannelJoin={handleBrowseChannelJoin}
+                      onBrowseDialogOpenChange={handleBrowseDialogOpenChange}
+                      onChannelManagementOpenChange={setIsChannelManagementOpen}
+                      onDeleteActiveChannel={() => {
+                        setIsChannelManagementOpen(false);
+                        void goHome({ replace: true });
+                      }}
+                      onSelectChannel={(channelId) => {
                         void goChannel(channelId);
                       }}
-                      onOpenResult={handleOpenSearchResult}
-                      searchHidden={topbarSearchHidden}
-                      searchLoading={topbarSearchLoading}
-                      searchFocusRequest={searchFocusRequest}
                     />
-                  ) : null}
-                  {settingsOpen ? (
-                    <React.Suspense fallback={null}>
-                      <LazySettingsScreen
-                        currentPubkey={identityQuery.data?.pubkey}
-                        fallbackDisplayName={identityQuery.data?.displayName}
-                        isUpdatingDesktopNotifications={
-                          notificationSettings.isUpdatingDesktopEnabled
-                        }
-                        notificationErrorMessage={
-                          notificationSettings.errorMessage
-                        }
-                        notificationPermission={notificationSettings.permission}
-                        notificationSettings={notificationSettings.settings}
-                        onClose={handleCloseSettings}
-                        onSectionChange={setSettingsSection}
-                        onSetDesktopNotificationsEnabled={
-                          notificationSettings.setDesktopEnabled
-                        }
-                        onSetHomeBadgeEnabled={
-                          notificationSettings.setHomeBadgeEnabled
-                        }
-                        onSetSlotAlertsEnabled={
-                          notificationSettings.setSlotAlertsEnabled
-                        }
-                        onSetNotifyWhileViewing={
-                          notificationSettings.setNotifyWhileViewing
-                        }
-                        onSetAllSlotAlertsEnabled={
-                          notificationSettings.setAllSlotAlertsEnabled
-                        }
-                        onSetSoundForSlot={notificationSettings.setSoundForSlot}
-                        section={settingsSection}
-                      />
-                    </React.Suspense>
-                  ) : (
-                    <>
-                      <AppSidebar
-                        activeWorkspace={workspacesHook.activeWorkspace}
-                        channels={sidebarChannels}
-                        currentPubkey={identityQuery.data?.pubkey}
-                        errorMessage={
-                          channelsQuery.error instanceof Error
-                            ? channelsQuery.error.message
-                            : undefined
-                        }
-                        fallbackDisplayName={identityQuery.data?.displayName}
-                        homeBadgeCount={homeBadgeCount}
-                        isAddWorkspaceOpen={isAddWorkspaceOpen}
-                        isCreatingChannel={createChannelMutation.isPending}
-                        isCreatingForum={createForumMutation.isPending}
-                        isLoading={channelsQuery.isLoading}
-                        isOpeningDm={openDmMutation.isPending}
-                        isNewDmOpen={isNewDmOpen}
-                        isCreateChannelOpen={isCreateChannelOpen}
-                        isPresencePending={presenceSession.isPending}
-                        onAddWorkspace={(workspace) => {
-                          const id = workspacesHook.addWorkspace(workspace);
-                          workspacesHook.switchWorkspace(id);
-                        }}
-                        onAddWorkspaceOpenChange={setIsAddWorkspaceOpen}
-                        onNewDmOpenChange={setIsNewDmOpen}
-                        onCreateChannelOpenChange={setIsCreateChannelOpen}
-                        onOpenAddWorkspace={() => setIsAddWorkspaceOpen(true)}
-                        onUpdateWorkspace={workspacesHook.updateWorkspace}
-                        onRemoveWorkspace={workspacesHook.removeWorkspace}
-                        onSwitchWorkspace={workspacesHook.switchWorkspace}
-                        selfPresenceStatus={presenceSession.currentStatus}
-                        workspaces={workspacesHook.workspaces}
-                        onCreateChannel={async ({
-                          description,
-                          name,
-                          visibility,
-                          ttlSeconds,
-                          templateId,
-                        }) => {
-                          const createdChannel =
-                            await createChannelMutation.mutateAsync({
-                              name,
-                              description,
-                              channelType: "stream",
-                              visibility,
-                              ttlSeconds,
-                            });
+                  </SidebarProvider>
+                </div>
 
-                          await applyCanvas(
-                            templateId,
-                            createdChannel.id,
-                            name,
-                          );
-                          await goChannel(createdChannel.id);
-                          void applyAgents(templateId, createdChannel.id);
-                        }}
-                        onCreateForum={async ({
-                          description,
-                          name,
-                          visibility,
-                          ttlSeconds,
-                          templateId,
-                        }) => {
-                          const createdForum =
-                            await createForumMutation.mutateAsync({
-                              name,
-                              description,
-                              channelType: "forum",
-                              visibility,
-                              ttlSeconds,
-                            });
-
-                          await applyCanvas(templateId, createdForum.id, name);
-                          await goChannel(createdForum.id);
-                          void applyAgents(templateId, createdForum.id);
-                        }}
-                        onHideDm={handleHideDm}
-                        onMarkAllChannelsRead={markAllChannelsRead}
-                        onMarkChannelRead={markChannelRead}
-                        onMarkChannelUnread={markChannelUnread}
-                        onOpenBrowseChannels={handleOpenBrowseChannels}
-                        onOpenBrowseForums={handleOpenBrowseForums}
-                        onOpenDm={async ({ pubkeys }) => {
-                          const directMessage =
-                            await openDmMutation.mutateAsync({
-                              pubkeys,
-                            });
-                          await goChannel(directMessage.id);
-                        }}
-                        onSelectAgents={() => void goAgents()}
-                        onSelectChannel={(channelId) =>
-                          void goChannel(channelId)
-                        }
-                        onSelectHome={() => void goHome()}
-                        onSelectProjects={() => void goProjects()}
-                        onSelectPulse={() => void goPulse()}
-                        onSelectSettings={handleOpenSettings}
-                        onSelectWorkflows={() => void goWorkflows()}
-                        onSetPresenceStatus={(status) =>
-                          presenceSession.setStatus(status)
-                        }
-                        onSetUserStatus={(text, emoji) =>
-                          setUserStatusMutation.mutate({ text, emoji })
-                        }
-                        onClearUserStatus={() =>
-                          setUserStatusMutation.mutate({ text: "", emoji: "" })
-                        }
-                        profile={profileQuery.data}
-                        selfUserStatus={
-                          deferredPubkey
-                            ? (selfStatusQuery.data?.[
-                                deferredPubkey.toLowerCase()
-                              ] ?? undefined)
-                            : undefined
-                        }
-                        selectedChannelId={selectedChannelId}
-                        selectedView={selectedView}
-                        unreadChannelIds={unreadChannelIds}
-                        mutedChannelIds={mutedChannelIds}
-                        onMuteChannel={muteChannel}
-                        onUnmuteChannel={unmuteChannel}
-                        starredChannelIds={starredChannelIds}
-                        onStarChannel={starChannel}
-                        onUnstarChannel={unstarChannel}
-                      />
-
-                      <MainInsetProvider mainInsetRef={mainInsetRef}>
-                        <SidebarInset
-                          ref={mainInsetRef}
-                          className="min-h-0 min-w-0 overflow-hidden"
-                          style={chromeCssVarDefaults}
-                        >
-                          <ConnectionBanner />
-                          <Outlet />
-                        </SidebarInset>
-                      </MainInsetProvider>
-                    </>
-                  )}
-
-                  <AppShellOverlays
-                    activeChannel={activeChannel}
-                    browseDialogType={browseDialogType}
-                    channels={channels}
-                    currentPubkey={identityQuery.data?.pubkey}
-                    isChannelManagementOpen={isChannelManagementOpen}
-                    onBrowseChannelJoin={handleBrowseChannelJoin}
-                    onBrowseDialogOpenChange={handleBrowseDialogOpenChange}
-                    onChannelManagementOpenChange={setIsChannelManagementOpen}
-                    onDeleteActiveChannel={() => {
-                      setIsChannelManagementOpen(false);
-                      void goHome({ replace: true });
-                    }}
-                    onSelectChannel={(channelId) => {
-                      void goChannel(channelId);
-                    }}
+                <div className="absolute inset-x-0 bottom-0 z-0 h-(--buzz-huddle-drawer-height)">
+                  <HuddleBar
+                    className="h-full"
+                    onVisibilityChange={setIsHuddleDrawerOpen}
                   />
-                </SidebarProvider>
+                </div>
               </div>
-
-              <div className="absolute inset-x-0 bottom-0 z-0 h-(--buzz-huddle-drawer-height)">
-                <HuddleBar
-                  className="h-full"
-                  onVisibilityChange={setIsHuddleDrawerOpen}
-                />
-              </div>
-            </div>
-          </HuddleProvider>
+            </HuddleProvider>
           </ServerlessProvider>
         </AppShellProvider>
       </ChannelNavigationProvider>
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index 2566670930..bf0ea2597a 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -461,36 +461,36 @@ export function AppSidebar({
             ) : null}
           </SidebarMenuItem>
           {!serverless && (
-          <FeatureGate feature="pulse">
-            <SidebarMenuItem>
-              <SidebarMenuButton
-                data-testid="open-pulse-view"
-                isActive={selectedView === "pulse"}
-                onClick={onSelectPulse}
-                tooltip="Pulse"
-                type="button"
-              >
-                <Activity className="h-4 w-4" />
-                <span>Pulse</span>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          </FeatureGate>
+            <FeatureGate feature="pulse">
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  data-testid="open-pulse-view"
+                  isActive={selectedView === "pulse"}
+                  onClick={onSelectPulse}
+                  tooltip="Pulse"
+                  type="button"
+                >
+                  <Activity className="h-4 w-4" />
+                  <span>Pulse</span>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </FeatureGate>
           )}
           {!serverless && (
-          <FeatureGate feature="projects">
-            <SidebarMenuItem>
-              <SidebarMenuButton
-                data-testid="open-projects-view"
-                isActive={selectedView === "projects"}
-                onClick={onSelectProjects}
-                tooltip="Projects"
-                type="button"
-              >
-                <FolderGit2 className="h-4 w-4" />
-                <span>Projects</span>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          </FeatureGate>
+            <FeatureGate feature="projects">
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  data-testid="open-projects-view"
+                  isActive={selectedView === "projects"}
+                  onClick={onSelectProjects}
+                  tooltip="Projects"
+                  type="button"
+                >
+                  <FolderGit2 className="h-4 w-4" />
+                  <span>Projects</span>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </FeatureGate>
           )}
           <SidebarMenuItem>
             <SidebarMenuButton
@@ -513,20 +513,20 @@ export function AppSidebar({
             ) : null}
           </SidebarMenuItem>
           {!serverless && (
-          <FeatureGate feature="workflows">
-            <SidebarMenuItem>
-              <SidebarMenuButton
-                data-testid="open-workflows-view"
-                isActive={selectedView === "workflows"}
-                onClick={onSelectWorkflows}
-                tooltip="Workflows"
-                type="button"
-              >
-                <Zap className="h-4 w-4" />
-                <span>Workflows</span>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          </FeatureGate>
+            <FeatureGate feature="workflows">
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  data-testid="open-workflows-view"
+                  isActive={selectedView === "workflows"}
+                  onClick={onSelectWorkflows}
+                  tooltip="Workflows"
+                  type="button"
+                >
+                  <Zap className="h-4 w-4" />
+                  <span>Workflows</span>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </FeatureGate>
           )}
         </SidebarMenu>
       </SidebarHeader>
diff --git a/desktop/src/features/workspaces/ui/WelcomeSetup.tsx b/desktop/src/features/workspaces/ui/WelcomeSetup.tsx
index 59de243766..7fd0245a00 100644
--- a/desktop/src/features/workspaces/ui/WelcomeSetup.tsx
+++ b/desktop/src/features/workspaces/ui/WelcomeSetup.tsx
@@ -202,7 +202,10 @@ export function WelcomeSetup({
       setError(null);
       if (checked && customRelayUrl.trim() === "") {
         setCustomRelayUrl(DEFAULT_SERVERLESS_RELAY);
-      } else if (!checked && customRelayUrl.trim() === DEFAULT_SERVERLESS_RELAY) {
+      } else if (
+        !checked &&
+        customRelayUrl.trim() === DEFAULT_SERVERLESS_RELAY
+      ) {
         setCustomRelayUrl("");
       }
     },