fix(chat): resolve a new chat's history entry to the chat route on Back, and say when an effort save fails

Author: waleedlatif1

apps/sim/app/o/[organizationId]/home/organization-home.tsx

@@ -35,6 +35,7 @@ import {
   useChatResourcePanel,
   useResourcePanelController,
 } from '@/app/workspace/[workspaceId]/home/hooks/use-resource-panel'
+import { useRestoredChatEntry } from '@/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
 import { searchFiltersFromParams } from '@/app/workspace/[workspaceId]/home/search-params'
 import type {
@@ -66,9 +67,10 @@ export function OrganizationHome(props: OrganizationHomeProps) {
   const { organization, searchAccess, canBuild, mothershipAvailable } = useOrganizationContext()
   const { data: session } = useSession()
   const isClient = useSyncExternalStore(subscribeToClient, clientSnapshot, serverSnapshot)
+  const isRestoredChatEntry = useRestoredChatEntry(props.chatId)
   if (!mothershipAvailable || (!canBuild && !searchAccess.memberScoped)) return null
   /** Preferences are browser-persisted and keyed by user; never paint a guessed mode first. */
-  if (!isClient || !session?.user?.id) return <HomeFallback />
+  if (isRestoredChatEntry || !isClient || !session?.user?.id) return <HomeFallback />
   return (
     <OrganizationHomeContent
       key={`${session.user.id}:${organization.id}:${props.chatId ?? 'new'}`}

apps/sim/app/workspace/[workspaceId]/home/home.tsx

@@ -24,10 +24,12 @@ import { persistImportedWorkflow } from '@/lib/workflows/operations/import-expor
 import { ChatResourcePanel } from '@/app/workspace/[workspaceId]/home/components/chat-resource-panel'
 import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 import { SuggestedActions } from '@/app/workspace/[workspaceId]/home/components/suggested-actions'
+import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
 import {
   useChatResourcePanel,
   useResourcePanelController,
 } from '@/app/workspace/[workspaceId]/home/hooks/use-resource-panel'
+import { useRestoredChatEntry } from '@/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
 import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
@@ -58,6 +60,8 @@ interface HomeProps {
 }
 
 export function Home(props: HomeProps) {
+  const isRestoredChatEntry = useRestoredChatEntry(props.chatId)
+  if (isRestoredChatEntry) return <HomeFallback />
   return (
     <PermissionAccessBoundary configKey='hideCopilot'>
       <HomeContent {...props} />

apps/sim/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry.ts

@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
+
+const CHAT_PATH = /^\/(?:workspace|o)\/[^/]+\/chat\/[^/]+$/
+
+/**
+ * Hands a restored new-chat history entry back to the router.
+ *
+ * A new chat moves its URL from the home route to `/chat/<id>` in place, through
+ * `history.replaceState`, so the turn streaming on that surface stays mounted. Next keeps
+ * the home route's tree in that history entry, so Back or Forward to it mounts the home
+ * route at the chat's URL. Replacing the entry through the router resolves the chat route
+ * and stores its tree, so later visits to the entry render the chat directly. Only the URL
+ * at mount counts: the surface that moved its own URL keeps rendering.
+ *
+ * @param chatId - The chat the surface was opened for; the new-chat surface has none.
+ * @returns Whether this mount is a restored entry; the caller renders its fallback until
+ *   the chat route replaces it.
+ */
+export function useRestoredChatEntry(chatId: string | undefined): boolean {
+  const router = useRouter()
+  const pathname = usePathname()
+  const searchParams = useSearchParams()
+  const [restoredChatUrl] = useState(() => {
+    if (chatId || !CHAT_PATH.test(pathname)) return null
+    const search = searchParams.toString()
+    return search ? `${pathname}?${search}` : pathname
+  })
+
+  useEffect(() => {
+    if (restoredChatUrl) router.replace(restoredChatUrl, { scroll: false })
+  }, [restoredChatUrl, router])
+
+  return restoredChatUrl !== null
+}

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

@@ -1,4 +1,5 @@
 import { jsonResponse } from '@sim/testing/helpers/http'
+import { emcnMock, emcnMockFns } from '@sim/testing/mocks/emcn.mock'
 import { reactQueryMock, reactQueryMockFns } from '@sim/testing/mocks/react-query.mock'
 import { sleep } from '@sim/utils/helpers'
 import type { MutationObserverOptions } from '@tanstack/react-query'
@@ -15,6 +16,7 @@ vi.mock('@/stores/mothership-queue/store', () => ({
 }))
 
 vi.mock('@tanstack/react-query', () => reactQueryMock)
+vi.mock('@sim/emcn', () => emcnMock)
 
 vi.mock('@/lib/browser-agent/transport', () => ({
   suspendBrowserScope,
@@ -134,5 +136,27 @@ describe('tasks query boundary parsing', () => {
     saves[2].resolve(jsonResponse({ success: true }))
     await Promise.all(outcomes)
     expect(useMothershipEffortStore.getState().chatEfforts['chat-1']?.effort).toBe('low')
+    expect(emcnMockFns.mockToast.error).not.toHaveBeenCalled()
+  })
+
+  it('tells the user when a failed save rolls their pick back', async () => {
+    const tanstack =
+      await vi.importActual<typeof import('@tanstack/react-query')>('@tanstack/react-query')
+    const observer = new tanstack.MutationObserver(
+      new tanstack.QueryClient(),
+      useSetMothershipChatEffort('chat-1') as unknown as MutationObserverOptions<
+        void,
+        Error,
+        MothershipEffort,
+        { pick: number }
+      >
+    )
+    vi.mocked(fetch).mockResolvedValueOnce(new Response('save failed', { status: 500 }))
+    useMothershipEffortStore.getState().reset()
+
+    await observer.mutate('xhigh').catch(() => undefined)
+
+    expect(useMothershipEffortStore.getState().chatEfforts['chat-1']).toBeUndefined()
+    expect(emcnMockFns.mockToast.error).toHaveBeenCalledTimes(1)
   })
 })

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

@@ -1,3 +1,4 @@
+import { toast } from '@sim/emcn'
 import { toError } from '@sim/utils/errors'
 import { isRecordLike } from '@sim/utils/object'
 import {
@@ -641,8 +642,10 @@ function chatEffortMutationOptions(queryClient: QueryClient, chatId: string | un
       return { pick: useMothershipEffortStore.getState().setChatEffort(chatId, effort) }
     },
     onError: (_error, _effort, context) => {
-      if (chatId && context)
-        useMothershipEffortStore.getState().dropChatEffort(chatId, context.pick)
+      if (!chatId || !context) return
+      if (useMothershipEffortStore.getState().dropChatEffort(chatId, context.pick)) {
+        toast.error("Couldn't change reasoning effort")
+      }
     },
     onSuccess: (_data, effort) => {
       queryClient.setQueryData<MothershipChatHistory>(

apps/sim/stores/mothership-effort/store.ts

@@ -30,8 +30,11 @@ interface MothershipEffortState {
   chatEfforts: Record<string, ChatEffortPick>
   /** Records a pick and returns its token for {@link MothershipEffortState.dropChatEffort}. */
   setChatEffort: (chatId: string, effort: MothershipEffort) => number
-  /** Drops a pick whose save failed, unless a newer pick replaced it, even one of the same value. */
-  dropChatEffort: (chatId: string, pick: number) => void
+  /**
+   * Drops a pick whose save failed, unless a newer pick replaced it, even one of the same value.
+   * Returns whether it dropped the pick, which rolls the chat back to its saved effort.
+   */
+  dropChatEffort: (chatId: string, pick: number) => boolean
   /** Moves the new-chat pick onto the chat its first send created. */
   adoptNewChatEffort: (chatId: string, effort: MothershipEffort) => void
   reset: () => void
@@ -58,7 +61,7 @@ function withModelSelection(
 export const useMothershipEffortStore = create<MothershipEffortState>()(
   devtools(
     persist(
-      (set) => ({
+      (set, get) => ({
         ...initialState,
         setFastMode: (fastMode) =>
           set((state) => withModelSelection({ ...state.modelSelection, fastMode })),
@@ -70,11 +73,11 @@ export const useMothershipEffortStore = create<MothershipEffortState>()(
           set((state) => ({ chatEfforts: { ...state.chatEfforts, [chatId]: { effort, pick } } }))
           return pick
         },
-        dropChatEffort: (chatId, pick) =>
-          set((state) => {
-            if (state.chatEfforts[chatId]?.pick !== pick) return state
-            return { chatEfforts: omit(state.chatEfforts, [chatId]) }
-          }),
+        dropChatEffort: (chatId, pick) => {
+          if (get().chatEfforts[chatId]?.pick !== pick) return false
+          set((state) => ({ chatEfforts: omit(state.chatEfforts, [chatId]) }))
+          return true
+        },
         adoptNewChatEffort: (chatId, effort) => {
           const pick = ++lastChatEffortPick
           set((state) => ({