fix(chats): reconcile partial deletes and collapsed selection

Author: waleedlatif1

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx

@@ -141,6 +141,8 @@ export function ChatsSection({
                     key={chat.id}
                     chat={chat}
                     isCurrentRoute={pathname === chat.href}
+                    isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
+                    onSelectChat={actions.handleChatClick}
                     isMenuOpen={menuOpenChatId === chat.id}
                     isEditing={rename.editingId === chat.id}
                     editValue={rename.value}

apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chat-actions.ts

@@ -8,6 +8,7 @@ import { useChatSelection } from '@/app/workspace/[workspaceId]/w/components/sid
 import { useFlyoutInlineRename } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-flyout-inline-rename'
 import { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
 import {
+  MothershipChatDeleteError,
   useDeleteMothershipChat,
   useDeleteMothershipChats,
   useMarkMothershipChatRead,
@@ -124,19 +125,27 @@ export function useOrganizationChatActions({
 
   const confirmDelete = useCallback(() => {
     if (chatsToDelete.length === 0 || isDeleting) return
+    const redirectIfDeleted = (ids: string[]) => {
+      if (
+        ids.some((id) => window.location.pathname === organizationRoutes(organizationId).chat(id))
+      ) {
+        router.push(organizationRoutes(organizationId).home)
+      }
+    }
     const options = {
       onSuccess: () => {
         setChatIdsToDelete([])
         useFolderStore.getState().clearChatSelection()
-        if (
-          chatIdsToDelete.some(
-            (id) => window.location.pathname === organizationRoutes(organizationId).chat(id)
-          )
-        ) {
-          router.push(organizationRoutes(organizationId).home)
+        redirectIfDeleted(chatIdsToDelete)
+      },
+      onError: (error: Error) => {
+        if (error instanceof MothershipChatDeleteError) {
+          const deletedIds = new Set(error.deletedChatIds)
+          setChatIdsToDelete((ids) => ids.filter((id) => !deletedIds.has(id)))
+          redirectIfDeleted(error.deletedChatIds)
         }
+        toast.error(error.message)
       },
-      onError: (error: Error) => toast.error(error.message),
     }
     if (chatsToDelete.length === 1) {
       deleteChat.mutate(chatsToDelete[0].id, options)

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/chat-navigation-link/chat-navigation-link.tsx

@@ -137,16 +137,15 @@ function IntentAwareChatNavigationLink({
       }}
       onTouchStart={onTouchStart}
       onClick={(event) => {
+        const isSelectionClick =
+          !event.defaultPrevented && !event.metaKey && !event.ctrlKey && !event.altKey
+        if (isSelectionClick && event.shiftKey && onSelectChat) {
+          event.preventDefault()
+          onSelectChat(chatId, true)
+        }
         onClick?.(event)
-        if (
-          !event.defaultPrevented &&
-          !event.metaKey &&
-          !event.ctrlKey &&
-          !event.altKey &&
-          onSelectChat
-        ) {
-          if (event.shiftKey) event.preventDefault()
-          onSelectChat(chatId, event.shiftKey)
+        if (isSelectionClick && !event.defaultPrevented) {
+          onSelectChat?.(chatId, false)
         }
         if (
           !event.defaultPrevented &&

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/collapsed-sidebar-menu/collapsed-sidebar-menu.tsx

@@ -156,6 +156,8 @@ type CollapsedSidebarMenuProps = {
 interface CollapsedChatFlyoutItemProps {
   chat: { id: string; href: string; name: string; isActive?: boolean; isUnread?: boolean }
   isCurrentRoute: boolean
+  isSelected?: boolean
+  onSelectChat?: (chatId: string, shiftKey: boolean) => void
   isMenuOpen?: boolean
   isEditing?: boolean
   editValue?: string
@@ -284,6 +286,8 @@ export function CollapsedSidebarMenu({
 export function CollapsedChatFlyoutItem({
   chat,
   isCurrentRoute,
+  isSelected = false,
+  onSelectChat,
   isMenuOpen = false,
   isEditing = false,
   editValue,
@@ -330,7 +334,7 @@ export function CollapsedChatFlyoutItem({
   return (
     <DropdownMenuItem
       asChild
-      active={isCurrentRoute || isMenuOpen}
+      active={isCurrentRoute || isSelected || isMenuOpen}
       actionOpen={isMenuOpen}
       action={
         showActions ? (
@@ -348,6 +352,7 @@ export function CollapsedChatFlyoutItem({
         chatId={chat.id}
         href={chat.href}
         isCurrentRoute={isCurrentRoute}
+        onSelectChat={onSelectChat}
         onContextMenu={
           chat.id !== 'new' && onContextMenu ? (e) => onContextMenu(e, chat.id) : undefined
         }

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -125,6 +125,7 @@ import { useFolderMap, useFolders } from '@/hooks/queries/folders'
 import { type LogFilters, useLogsList } from '@/hooks/queries/logs'
 import type { MothershipChatMetadata } from '@/hooks/queries/mothership-chats'
 import {
+  MothershipChatDeleteError,
   useDeleteMothershipChat,
   useDeleteMothershipChats,
   useMarkMothershipChatRead,
@@ -887,7 +888,19 @@ export const Sidebar = memo(function Sidebar({ organizationHref }: SidebarProps)
     if (chatIdsToDelete.length === 1) {
       deleteChatMutation.mutate(chatIdsToDelete[0], { onSuccess: onDeleteSuccess })
     } else {
-      deleteChatsMutation.mutate(chatIdsToDelete, { onSuccess: onDeleteSuccess })
+      deleteChatsMutation.mutate(chatIdsToDelete, {
+        onSuccess: onDeleteSuccess,
+        onError: (error) => {
+          if (
+            error instanceof MothershipChatDeleteError &&
+            error.deletedChatIds.some(
+              (id) => window.location.pathname === `/workspace/${workspaceId}/chat/${id}`
+            )
+          ) {
+            router.push(`/workspace/${workspaceId}/home`)
+          }
+        },
+      })
     }
     setIsChatDeleteModalOpen(false)
   }
@@ -1445,6 +1458,8 @@ export const Sidebar = memo(function Sidebar({ organizationHref }: SidebarProps)
                                     key={chat.id}
                                     chat={chat}
                                     isCurrentRoute={pathname === chat.href}
+                                    isSelected={hasChatMultiSelection && selectedChats.has(chat.id)}
+                                    onSelectChat={handleChatClick}
                                     isMenuOpen={menuOpenChatId === chat.id}
                                     isEditing={chat.id === chatFlyoutRename.editingId}
                                     editValue={chatFlyoutRename.value}

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/utils.ts

@@ -10,7 +10,9 @@ export function isSidebarBackgroundClick(event: MouseEvent<HTMLElement>): boolea
   return (
     event.target instanceof Element &&
     event.currentTarget.contains(event.target) &&
-    !event.target.closest('button, [role="button"], a')
+    !event.target.closest(
+      'a, button, input, textarea, select, [role="button"], [contenteditable]:not([contenteditable="false"])'
+    )
   )
 }
 

apps/sim/hooks/queries/mothership-chats.ts

@@ -1,3 +1,4 @@
+import { toError } from '@sim/utils/errors'
 import { isRecordLike } from '@sim/utils/object'
 import {
   keepPreviousData,
@@ -64,6 +65,17 @@ export interface MothershipChatHistory {
 
 export type MothershipChatOwner = string | { organizationId: string }
 
+/** Reports which chats were deleted when another request in the batch failed. */
+export class MothershipChatDeleteError extends Error {
+  constructor(
+    readonly deletedChatIds: string[],
+    cause: Error
+  ) {
+    super(cause.message, { cause })
+    this.name = 'MothershipChatDeleteError'
+  }
+}
+
 export const mothershipChatKeys = {
   all: ['mothership-chats'] as const,
   lists: () => [...mothershipChatKeys.all, 'list'] as const,
@@ -377,7 +389,10 @@ export function useDeleteMothershipChats(owner?: MothershipChatOwner) {
         })
       )
       const failed = results.find((result) => result.status === 'rejected')
-      if (failed) throw failed.reason
+      if (failed) {
+        const deletedChatIds = chatIds.filter((_, index) => results[index].status === 'fulfilled')
+        throw new MothershipChatDeleteError(deletedChatIds, toError(failed.reason))
+      }
     },
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: mothershipChatKeys.ownerLists(owner) })