fix: pass directory context through schedules navigation, hoist SSE after directory resolve

Author: chriswritescode-dev

frontend/src/components/schedules/RunDetailPanel.tsx

@@ -7,13 +7,14 @@ import type { ScheduleRun } from '@opencode-manager/shared/types'
 
 interface RunDetailPanelProps {
   repoId: number
+  directory?: string
   activeRun: ScheduleRun | null
   selectedRunLoading: boolean
   onCancelRun: () => void
   cancelRunPending: boolean
 }
 
-export function RunDetailPanel({ repoId, activeRun, selectedRunLoading, onCancelRun, cancelRunPending }: RunDetailPanelProps) {
+export function RunDetailPanel({ repoId, directory, activeRun, selectedRunLoading, onCancelRun, cancelRunPending }: RunDetailPanelProps) {
   const navigate = useNavigate()
 
   if (selectedRunLoading && !activeRun) {
@@ -41,7 +42,7 @@ export function RunDetailPanel({ repoId, activeRun, selectedRunLoading, onCancel
         <div className="flex items-center justify-between gap-2 px-3 py-2">
           <div className="flex items-center gap-2">
             {activeRun.sessionId && (
-              <Button variant="outline" size="sm" onClick={() => navigate(`/repos/${repoId}/sessions/${activeRun.sessionId}`)}>
+              <Button variant="outline" size="sm" onClick={() => navigate(`/repos/${repoId}/sessions/${activeRun.sessionId}${repoId === 0 ? '?assistant=1' : ''}`, { state: { directory } })}>
                 Open session
               </Button>
             )}

frontend/src/components/schedules/RunHistoryCards.tsx

@@ -9,6 +9,7 @@ import { useRepoScheduleRun } from '@/hooks/useSchedules'
 interface RunHistoryCardsProps {
   runs: ScheduleRun[] | undefined
   runsLoading: boolean
+  directory?: string
   onSelectRun: (id: number) => void
   onCancelRun: () => void
   cancelRunPending: boolean
@@ -17,6 +18,7 @@ interface RunHistoryCardsProps {
 export function RunHistoryCards({
   runs,
   runsLoading,
+  directory,
   onSelectRun,
   onCancelRun,
   cancelRunPending,
@@ -113,6 +115,7 @@ export function RunHistoryCards({
                   <div className="flex flex-col min-h-0 flex-1 overflow-hidden">
                     <RunDetailPanel
                       repoId={run.repoId}
+                      directory={directory}
                       activeRun={displayRun}
                       selectedRunLoading={isExpanded && isLoading}
                       onCancelRun={onCancelRun}

frontend/src/components/schedules/RunHistoryTab.tsx

@@ -5,6 +5,7 @@ import { RunHistoryCards, RunDetailPanel } from '@/components/schedules'
 
 interface RunHistoryTabProps {
   repoId: number
+  directory?: string
   selectedJob: ScheduleJob | undefined
   runs: ScheduleRun[] | undefined
   runsLoading: boolean
@@ -17,6 +18,7 @@ interface RunHistoryTabProps {
 
 export function RunHistoryTab({
   repoId,
+  directory,
   selectedJob,
   runs,
   runsLoading,
@@ -53,6 +55,7 @@ export function RunHistoryTab({
         <RunHistoryCards
           runs={runs}
           runsLoading={runsLoading}
+          directory={directory}
           onSelectRun={onSelectRun}
           onCancelRun={onCancelRun}
           cancelRunPending={cancelRunPending}
@@ -61,6 +64,7 @@ export function RunHistoryTab({
         <div className="hidden xl:flex min-h-0 flex-col overflow-hidden rounded-xl border border-border/60 bg-background/60 p-4">
           <RunDetailPanel
             repoId={repoId}
+            directory={directory}
             activeRun={activeRun}
             selectedRunLoading={selectedRunLoading}
             onCancelRun={onCancelRun}

frontend/src/components/session/SessionList.test.tsx

@@ -36,10 +36,11 @@ vi.mock('@/hooks/useOpenCode', () => ({
 
 describe('SessionList', () => {
   beforeEach(() => {
+    const now = Date.now()
     sessionsData.splice(0, sessionsData.length,
-      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/a', workspaceID: 'wrk_a', time: { updated: Date.now() } },
-      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/b', workspaceID: 'wrk_b', time: { updated: Date.now() } },
-      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/c', workspaceID: 'wrk_c', time: { updated: Date.now() } },
+      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/a', workspaceID: 'wrk_a', time: { updated: now } },
+      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/b', workspaceID: 'wrk_b', time: { updated: now - 1 } },
+      { id: 'ses_same', title: 'audit: mic-warmup 1/2 #2', directory: '/w/c', workspaceID: 'wrk_c', time: { updated: now - 2 } },
     )
     createSessionMock.mockReset()
     createSessionState.directory = undefined

frontend/src/contexts/EventContext.tsx

@@ -269,6 +269,16 @@ export function EventProvider({ children }: { children: React.ReactNode }) {
     return repo?.id ?? null
   }, [repos, findSessionDirectory])
 
+  const navigateToSession = useCallback((sessionID: string) => {
+    const repoId = getRepoIdForSession(sessionID)
+    if (!repoId && repoId !== 0) return
+    const directory = findSessionDirectory(sessionID) ?? undefined
+    const targetPath = `/repos/${repoId}/sessions/${sessionID}${repoId === 0 ? '?assistant=1' : ''}`
+    if (`${window.location.pathname}${window.location.search}` !== targetPath) {
+      navigate(targetPath, { state: { directory } })
+    }
+  }, [findSessionDirectory, getRepoIdForSession, navigate])
+
   const getClient = useCallback((sessionID: string): OpenCodeClient | null => {
     const result = findSessionInCache(sessionID)
     if (!result) return null
@@ -397,25 +407,13 @@ export function EventProvider({ children }: { children: React.ReactNode }) {
 
   const navigateToCurrentQuestion = useCallback(() => {
     if (!currentQuestion) return
-    const repoId = getRepoIdForSession(currentQuestion.sessionID)
-    if (repoId) {
-      const targetPath = `/repos/${repoId}/sessions/${currentQuestion.sessionID}`
-      if (window.location.pathname !== targetPath) {
-        navigate(targetPath)
-      }
-    }
-  }, [currentQuestion, getRepoIdForSession, navigate])
+    navigateToSession(currentQuestion.sessionID)
+  }, [currentQuestion, navigateToSession])
 
   const navigateToCurrentPermission = useCallback(() => {
     if (!currentPermission) return
-    const repoId = getRepoIdForSession(currentPermission.sessionID)
-    if (repoId) {
-      const targetPath = `/repos/${repoId}/sessions/${currentPermission.sessionID}`
-      if (window.location.pathname !== targetPath) {
-        navigate(targetPath)
-      }
-    }
-  }, [currentPermission, getRepoIdForSession, navigate])
+    navigateToSession(currentPermission.sessionID)
+  }, [currentPermission, navigateToSession])
 
   const fetchInitialPendingData = useCallback(async () => {
     const reposToUse = reposRef.current

frontend/src/hooks/useCommandHandler.ts

@@ -82,8 +82,9 @@ export function useCommandHandler({
               const repoMatch = currentPath.match(/\/repos\/(\d+)\/sessions\//)
               if (repoMatch) {
                 const repoId = repoMatch[1]
-                const newPath = `/repos/${repoId}/sessions/${newSession.id}`
-                navigate(newPath)
+                const assistantSuffix = new URLSearchParams(window.location.search).get('assistant') === '1' ? '?assistant=1' : ''
+                const newPath = `/repos/${repoId}/sessions/${newSession.id}${assistantSuffix}`
+                navigate(newPath, { state: { directory } })
               } else {
                 navigate(`/session/${newSession.id}`)
               }

frontend/src/pages/AssistantRedirect.tsx

@@ -4,7 +4,7 @@ import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { getRepo } from "@/api/repos"
 import { OpenCodeClient } from "@/api/opencode"
 import { getCachedAssistantDirectory, setCachedAssistantSessionId, useAssistantSessionLauncher } from "@/hooks/useAssistantSessionLauncher"
-import { useCreateSession } from "@/hooks/useOpenCode"
+import { useCreateSession, useSessionsAcrossDirectories } from "@/hooks/useOpenCode"
 import { useDialogParam } from "@/hooks/useDialogParam"
 import { useSSE } from "@/hooks/useSSE"
 import { OPENCODE_API_ENDPOINT } from "@/config"
@@ -66,6 +66,16 @@ export function AssistantRedirect() {
 
   const assistantDirectory = repo?.fullPath ?? cachedAssistantDirectory
   const assistantFileBasePath = assistantDirectory?.split('/').filter(Boolean).at(-1)
+  const assistantSessionDirectories = showSessionList && assistantDirectory ? [assistantDirectory] : []
+  const { data: assistantSessionsForWarmup } = useSessionsAcrossDirectories(opcodeUrl, assistantSessionDirectories, { limit: 25 })
+
+  const prefetchAssistantMessages = useCallback((sessionId: string, directory?: string) => {
+    if (!directory) return
+    void queryClient.prefetchQuery({
+      queryKey: messagesQueryKey(opcodeUrl, sessionId, directory),
+      queryFn: () => new OpenCodeClient(opcodeUrl, directory).listMessages(sessionId),
+    })
+  }, [opcodeUrl, queryClient])
 
   const { openAssistant } = useAssistantSessionLauncher({
     repoId,
@@ -81,6 +91,7 @@ export function AssistantRedirect() {
     if (assistantDirectory) {
       setCachedAssistantSessionId(repoId, assistantDirectory, session.id)
     }
+    prefetchAssistantMessages(session.id, assistantDirectory)
     navigate(`/repos/${repoId}/sessions/${session.id}?assistant=1`, { state: { directory: assistantDirectory } })
   })
 
@@ -89,8 +100,17 @@ export function AssistantRedirect() {
     if (selectedDirectory) {
       setCachedAssistantSessionId(repoId, selectedDirectory, sessionId)
     }
+    prefetchAssistantMessages(sessionId, selectedDirectory)
     navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`, { state: { directory: selectedDirectory } })
-  }, [assistantDirectory, navigate, repoId])
+  }, [assistantDirectory, navigate, prefetchAssistantMessages, repoId])
+
+  useEffect(() => {
+    if (!showSessionList || !assistantDirectory || assistantSessionsForWarmup.length === 0) return
+    const session = assistantSessionsForWarmup.find((item) => !item.parentID) ?? assistantSessionsForWarmup[0]
+    if (session?.id) {
+      prefetchAssistantMessages(session.id, session.directory ?? assistantDirectory)
+    }
+  }, [assistantDirectory, assistantSessionsForWarmup, prefetchAssistantMessages, showSessionList])
 
   const handleCreateSession = async () => {
     await createSessionMutation.mutateAsync({ agent: undefined })

frontend/src/pages/Schedules.tsx

@@ -284,6 +284,7 @@ export function Schedules() {
             {repoScheduleTab === 'runs' && (
               <RunHistoryTab
                 repoId={repoId}
+                directory={scheduleTarget?.fullPath}
                 selectedJob={selectedJob}
                 runs={runs}
                 runsLoading={runsLoading}

frontend/src/pages/SessionDetail.tsx

@@ -52,7 +52,7 @@ import { SessionTodoDisplay } from "@/components/message/SessionTodoDisplay";
 import { useDialogParam } from "@/hooks/useDialogParam";
 import { useSidebarAction } from "@/hooks/useSidebarAction";
 import { SessionMoreButton } from "@/components/navigation/SessionMoreButton";
-import { setCachedAssistantSessionId } from "@/hooks/useAssistantSessionLauncher";
+import { getCachedAssistantDirectory, setCachedAssistantSessionId } from "@/hooks/useAssistantSessionLauncher";
 
 const compareMessageIds = (id1: string, id2: string): number => {
   const num1 = parseInt(id1, 10)
@@ -120,7 +120,8 @@ export function SessionDetail() {
 
   const opcodeUrl = OPENCODE_API_ENDPOINT;
 
-  const repoDirectory = navigationDirectory ?? repo?.fullPath;
+  const cachedAssistantDirectory = isAssistantSession ? getCachedAssistantDirectory(repoId) : undefined;
+  const repoDirectory = navigationDirectory ?? repo?.fullPath ?? cachedAssistantDirectory;
   const sessionRouteSuffix = isAssistantSession ? '?assistant=1' : '';
 
   useEffect(() => {
@@ -129,13 +130,13 @@ export function SessionDetail() {
     }
   }, [isAssistantSession, repoDirectory, repoId, sessionId]);
 
-  const { isConnected, isReconnecting } = useSSE(opcodeUrl, repoDirectory, sessionId);
-
   const { data: rawMessages, isLoading: messagesLoading } = useMessages(opcodeUrl, sessionId, repoDirectory);
+  const initialMessagesDirectory = repoDirectory && !messagesLoading ? repoDirectory : undefined;
+  const { isConnected, isReconnecting } = useSSE(opcodeUrl, initialMessagesDirectory, sessionId);
   const { data: session } = useSession(
     opcodeUrl,
     sessionId,
-    repoDirectory,
+    initialMessagesDirectory,
   );
 
   const messages = useMemo(() => {
@@ -161,7 +162,7 @@ export function SessionDetail() {
   const abortSession = useAbortSession(opcodeUrl, repoDirectory, sessionId);
   const updateSession = useUpdateSession(opcodeUrl, repoDirectory);
   const createSession = useCreateSession(opcodeUrl, repoDirectory);
-  const { model, modelString } = useModelSelection(opcodeUrl, repoDirectory);
+  const { model, modelString } = useModelSelection(opcodeUrl, initialMessagesDirectory);
   const isEditingMessage = useUIState((state) => state.isEditingMessage);
   const setActivePromptFileBasePath = useUIState((state) => state.setActivePromptFileBasePath);
   const { isEnabled: ttsEnabled } = useTTS();
@@ -217,20 +218,20 @@ export function SessionDetail() {
   }, [sessionId, minimizedQuestion])
 
   const syncPendingActionsForSession = useCallback(async () => {
-    if (!repoDirectory || !sessionId) return
+    if (!initialMessagesDirectory || !sessionId) return
     await Promise.all([
-      syncPermissionsForSession(repoDirectory, sessionId),
-      syncQuestionsForSession(repoDirectory, sessionId),
+      syncPermissionsForSession(initialMessagesDirectory, sessionId),
+      syncQuestionsForSession(initialMessagesDirectory, sessionId),
     ])
-  }, [repoDirectory, sessionId, syncPermissionsForSession, syncQuestionsForSession])
+  }, [initialMessagesDirectory, sessionId, syncPermissionsForSession, syncQuestionsForSession])
 
   useQuery({
-    queryKey: ['opencode', 'pending-actions', opcodeUrl, sessionId, repoDirectory],
+    queryKey: ['opencode', 'pending-actions', opcodeUrl, sessionId, initialMessagesDirectory],
     queryFn: async () => {
       await syncPendingActionsForSession()
       return null
     },
-    enabled: !!repoDirectory && !!sessionId,
+    enabled: !!initialMessagesDirectory && !!sessionId,
     refetchOnMount: 'always',
     refetchOnReconnect: true,
     refetchOnWindowFocus: true,
@@ -475,13 +476,15 @@ export function SessionDetail() {
             <div className="flex items-center gap-1">
               <PendingActionsGroup />
             </div>
-            <ContextUsageIndicator
-              opcodeUrl={opcodeUrl}
-              sessionID={sessionId}
-              directory={repoDirectory}
-              isConnected={isConnected}
-              isReconnecting={isReconnecting}
-            />
+            {initialMessagesDirectory && (
+              <ContextUsageIndicator
+                opcodeUrl={opcodeUrl}
+                sessionID={sessionId}
+                directory={initialMessagesDirectory}
+                isConnected={isConnected}
+                isReconnecting={isReconnecting}
+              />
+            )}
             <SessionMoreButton />
           </Header.Actions>
         </Header>
@@ -508,7 +511,7 @@ export function SessionDetail() {
             />
           ) : null}
         </div>
-        {opcodeUrl && repoDirectory && !isEditingMessage && (
+        {opcodeUrl && initialMessagesDirectory && !isEditingMessage && (
           <div
             ref={promptOverlayRef}
             className="absolute left-0 right-0 flex justify-center"
@@ -563,7 +566,7 @@ export function SessionDetail() {
               <PromptInput
                 ref={promptInputRef}
                 opcodeUrl={opcodeUrl}
-                directory={repoDirectory}
+                directory={initialMessagesDirectory}
                 sessionID={sessionId}
                 disabled={!isConnected}
                 showScrollButton={showScrollButton && !hasPromptContent}

frontend/src/pages/__tests__/SessionDetail.first-load-directory.test.tsx

@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, waitFor } from '@testing-library/react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { MemoryRouter, Route, Routes } from 'react-router-dom'
+import { setCachedAssistantSessionId } from '../../hooks/useAssistantSessionLauncher'
 import { SessionDetail } from '../SessionDetail'
 
 const mocks = vi.hoisted(() => ({
@@ -171,6 +172,7 @@ vi.mock('@/components/notifications/PendingActionsGroup', () => ({
 describe('SessionDetail first-load navigation directory', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    localStorage.clear()
 
     mocks.useSession.mockReturnValue({ data: undefined, isLoading: false })
     mocks.useMessages.mockReturnValue({ data: [], isLoading: false })
@@ -246,6 +248,20 @@ describe('SessionDetail first-load navigation directory', () => {
     expect(sessionCall?.[2]).toBeUndefined()
   })
 
+  it('uses the cached assistant directory on direct assistant session load while the repo is loading', async () => {
+    setCachedAssistantSessionId(0, '/abs/assistant', 'sess-assistant')
+
+    renderSession('/repos/0/sessions/sess-assistant?assistant=1')
+
+    await waitFor(() => {
+      const call = mocks.useMessages.mock.calls[mocks.useMessages.mock.calls.length - 1]
+      expect(call?.[2]).toBe('/abs/assistant')
+    })
+
+    const sessionCall = mocks.useSession.mock.calls[mocks.useSession.mock.calls.length - 1]
+    expect(sessionCall?.[2]).toBe('/abs/assistant')
+  })
+
   it('renders messages instead of the skeleton when assistant navigation provides directory while the repo is loading', async () => {
     const { queryByText, getByText } = renderSession({
       pathname: '/repos/0/sessions/sess-assistant',