refactor: consolidate url state hooks and add shared test utilities

Author: chriswritescode-dev

frontend/src/components/navigation/DesktopSidebar.test.tsx

@@ -228,4 +228,26 @@ describe('DesktopSidebar', () => {
 
     expect(screen.getByTestId('location').textContent).toBe('/?dialog=files&settings=open&settingsTab=account')
   })
+
+  it('preserves session route as return target when opening schedules', () => {
+    vi.spyOn(useDesktopModule, 'useDesktop').mockReturnValue(true)
+    vi.spyOn(useSidebarCollapsedModule, 'useSidebarCollapsed').mockReturnValue([false, vi.fn()])
+    vi.spyOn(useAuthModule, 'useAuth').mockReturnValue({
+      isAuthenticated: true,
+      isLoading: false,
+      logout: vi.fn(),
+    } as any)
+
+    render(
+      <>
+        <DesktopSidebar />
+        <LocationDisplay />
+      </>,
+      { wrapper: createWrapper(['/repos/5/sessions/abc?assistant=1']) }
+    )
+
+    fireEvent.click(screen.getByText('Schedules'))
+
+    expect(screen.getByTestId('location').textContent).toBe('/repos/5/schedules?returnTo=%2Frepos%2F5%2Fsessions%2Fabc%3Fassistant%3D1')
+  })
 })

frontend/src/components/navigation/DesktopSidebar.tsx

@@ -5,6 +5,7 @@ import { useSidebarCollapsed } from '@/hooks/useSidebarCollapsed'
 import { useAuth } from '@/hooks/useAuth'
 import { useUrlParams } from '@/hooks/useUrlParams'
 import { buildNavModel, type MoreDrawerItem, type NavPrimaryCta } from '@/components/navigation/moreDrawerItems'
+import { getPathWithReturnTo } from '@/lib/navigation'
 import { RepoQuickSwitchSheet } from '@/components/navigation/RepoQuickSwitchSheet'
 import {
   Sidebar,
@@ -48,7 +49,10 @@ export function DesktopSidebar() {
 
   const handleItemClick = (item: MoreDrawerItem) => {
     if (item.to) {
-      navigate(item.to)
+      const to = item.key === 'schedules'
+        ? getPathWithReturnTo(item.to, `${location.pathname}${location.search}`)
+        : item.to
+      navigate(to)
     } else if (item.dialog) {
       updateParams((p) => {
         p.set('dialog', item.dialog!)

frontend/src/components/navigation/MoreDrawer.test.tsx

@@ -250,4 +250,16 @@ describe('MoreDrawer', () => {
     expect(screen.queryByText('wrong-repo')).not.toBeInTheDocument()
   })
 
+  it('preserves session route as return target when opening schedules', () => {
+    const navigateMock = vi.fn()
+    vi.mocked(useNavigate).mockReturnValue(navigateMock)
+    mockAuth()
+    mockServerHealth()
+    renderMoreDrawer({ initialEntry: '/repos/1/sessions/session-1?assistant=1', routePath: '/repos/:id/sessions/:sessionId' })
+
+    fireEvent.click(screen.getByText('Schedules'))
+
+    expect(navigateMock).toHaveBeenCalledWith('/repos/1/schedules?returnTo=%2Frepos%2F1%2Fsessions%2Fsession-1%3Fassistant%3D1')
+  })
+
 })

frontend/src/components/navigation/MoreDrawer.tsx

@@ -14,7 +14,7 @@ import { FileBrowserSheet } from '@/components/file-browser/FileBrowserSheet'
 import { buildMoreItems } from './moreDrawerItems'
 import { useSwipeBack } from '@/hooks/useMobile'
 import { getRepoDisplayName } from '@/lib/utils'
-import { isAssistantPath } from '@/lib/navigation'
+import { getPathWithReturnTo, isAssistantPath } from '@/lib/navigation'
 import type { components } from '@/api/opencode-types'
 
 type CommandType = components['schemas']['Command']
@@ -33,12 +33,12 @@ export function MoreDrawer({ isOpen, onClose }: MoreDrawerProps) {
   const [mentionFileBrowserOpen, setMentionFileBrowserOpen] = useState(false)
   const swipeRef = useRef<HTMLDivElement>(null)
   const { bind } = useSwipeBack(onClose, { enabled: isOpen, suspendsRouteSwipe: true })
-  const { search, updateParams } = useUrlParams()
+  const { searchParams, updateParams } = useUrlParams()
   const { logout } = useAuth()
   const { data: health } = useServerHealth()
   const isSessionDetail = /^\/repos\/\d+\/sessions\/[^/]+$/.test(location.pathname)
   const isAssistantRoute = isAssistantPath(location.pathname)
-  const isAssistantSession = isSessionDetail && new URLSearchParams(search).get('assistant') === '1'
+  const isAssistantSession = isSessionDetail && searchParams.get('assistant') === '1'
   const { filterCommands } = useCommands(isSessionDetail ? OPENCODE_API_ENDPOINT : null)
   const activePromptFileBasePath = useUIState((state) => state.activePromptFileBasePath)
   const selectPromptCommand = useUIState((state) => state.selectPromptCommand)
@@ -80,7 +80,10 @@ export function MoreDrawer({ isOpen, onClose }: MoreDrawerProps) {
 
   const handleItemClick = (item: ReturnType<typeof buildMoreItems>[0]) => {
     if (item.to) {
-      navigate(item.to)
+      const to = item.key === 'schedules'
+        ? getPathWithReturnTo(item.to, `${location.pathname}${location.search}`)
+        : item.to
+      navigate(to)
     } else if (item.dialog) {
       updateParams((p) => {
         p.set('dialog', item.dialog!)

frontend/src/components/navigation/RepoQuickSwitchSheet.tsx

@@ -9,6 +9,7 @@ import { listRepos } from '@/api/repos'
 import { AddRepoDialog } from '@/components/repo/AddRepoDialog'
 import { FolderGit2, Check, Plus, House } from 'lucide-react'
 import { isAssistantPath, getAssistantPath } from '@/lib/navigation'
+import { useUrlParams } from '@/hooks/useUrlParams'
 
 interface RepoQuickSwitchSheetProps {
   isOpen: boolean
@@ -18,6 +19,7 @@ interface RepoQuickSwitchSheetProps {
 export function RepoQuickSwitchSheet({ isOpen, onClose }: RepoQuickSwitchSheetProps) {
   const navigate = useNavigate()
   const location = useLocation()
+  const { searchParams } = useUrlParams()
   const [searchQuery, setSearchQuery] = useState('')
   const [addRepoOpen, setAddRepoOpen] = useState(false)
 
@@ -45,7 +47,7 @@ export function RepoQuickSwitchSheet({ isOpen, onClose }: RepoQuickSwitchSheetPr
     )
   }, [repos, searchQuery])
 
-  const isUrlControlledSheet = new URLSearchParams(location.search).get('mobileTab') === 'repos'
+  const isUrlControlledSheet = searchParams.get('mobileTab') === 'repos'
 
   const navigateAndClose = (path: string, options?: { replace?: boolean }) => {
     navigate(path, options)
@@ -55,7 +57,7 @@ export function RepoQuickSwitchSheet({ isOpen, onClose }: RepoQuickSwitchSheetPr
   }
 
   const handleClick = (id: number) => {
-    const pendingAction = new URLSearchParams(location.search).get('mobileTabAction')
+    const pendingAction = searchParams.get('mobileTabAction')
 
     if (isAssistantRoute) {
       navigateAndClose(`/repos/${id}`, { replace: true })