fix: preserve directory context through navigate state across session navigations

Author: chriswritescode-dev

frontend/src/components/session/SessionList.tsx

@@ -15,7 +15,7 @@ interface SessionListProps {
   createDirectory?: string;
   directoryLabels?: Record<string, string>;
   activeSessionID?: string;
-  onSelectSession: (sessionID: string) => void;
+  onSelectSession: (sessionID: string, directory?: string) => void;
 }
 
 export const SessionList = ({
@@ -41,7 +41,7 @@ export const SessionList = ({
   const { data: sessions, isLoading, fetchNextPage, hasNextPage, isFetchingNextPage } = useSessionsAcrossDirectories(opcodeUrl, directoriesList, { search: searchQuery, limit: 25 });
   const deleteSession = useDeleteSession(opcodeUrl, directoriesList);
   const createSession = useCreateSession(opcodeUrl, sessionCreateDirectory, (newSession) => {
-    onSelectSession(newSession.id);
+    onSelectSession(newSession.id, primaryDirectory);
   });
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [sessionToDelete, setSessionToDelete] = useState<DeleteSessionTarget | DeleteSessionTarget[] | null>(null);
@@ -273,7 +273,7 @@ export const SessionList = ({
                       isActive={activeSessionID === session.id}
                       manageMode={manageMode}
                       workspaceLabel={session.directory ? directoryLabels?.[session.directory] : undefined}
-                      onSelect={onSelectSession}
+                      onSelect={(sessionID) => onSelectSession(sessionID, session.directory ?? primaryDirectory)}
                       onToggleSelection={(selected) => toggleSessionSelection(session, selected)}
                       onDelete={(e) => handleDelete(session, e)}
                     />
@@ -292,7 +292,7 @@ export const SessionList = ({
                   isActive={activeSessionID === session.id}
                   manageMode={manageMode}
                   workspaceLabel={session.directory ? directoryLabels?.[session.directory] : undefined}
-                  onSelect={onSelectSession}
+                  onSelect={(sessionID) => onSelectSession(sessionID, session.directory ?? primaryDirectory)}
                   onToggleSelection={(selected) => toggleSessionSelection(session, selected)}
                   onDelete={(e) => handleDelete(session, e)}
                 />

frontend/src/pages/AssistantRedirect.tsx

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useState } from "react"
 import { useNavigate, useLocation } from "react-router-dom"
 import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { getRepo } from "@/api/repos"
+import { OpenCodeClient } from "@/api/opencode"
 import { setCachedAssistantSessionId, useAssistantSessionLauncher } from "@/hooks/useAssistantSessionLauncher"
 import { useCreateSession } from "@/hooks/useOpenCode"
 import { useDialogParam } from "@/hooks/useDialogParam"
@@ -16,7 +17,7 @@ import { RepoSkillsDialog } from "@/components/repo/RepoSkillsDialog"
 import { SourceControlPanel } from "@/components/source-control"
 import { ResetPermissionsDialog } from "@/components/repo/ResetPermissionsDialog"
 import { PendingActionsGroup } from "@/components/notifications/PendingActionsGroup"
-import { invalidateConfigCaches } from "@/lib/queryInvalidation"
+import { invalidateConfigCaches, messagesQueryKey } from "@/lib/queryInvalidation"
 import { getSessionListPath, getAssistantPath, getAssistantSessionListPath } from "@/lib/navigation"
 import { SwitchConfigDialog } from "@/components/repo/SwitchConfigDialog"
 import { Loader2, Plus } from "lucide-react"
@@ -45,13 +46,17 @@ export function AssistantRedirect() {
   const handleNavigate = useCallback((sessionId: string) => {
     if (repo?.fullPath) {
       setCachedAssistantSessionId(repoId, repo.fullPath, sessionId)
+      void queryClient.prefetchQuery({
+        queryKey: messagesQueryKey(opcodeUrl, sessionId, repo.fullPath),
+        queryFn: () => new OpenCodeClient(opcodeUrl, repo.fullPath).listMessages(sessionId),
+      })
     }
     setStatus("opening")
     if (!showSessionList) {
       window.history.replaceState(window.history.state, "", getSessionListPath(repoId, true))
     }
-    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`)
-  }, [navigate, repo?.fullPath, repoId, showSessionList])
+    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`, { state: { directory: repo?.fullPath } })
+  }, [navigate, opcodeUrl, queryClient, repo?.fullPath, repoId, showSessionList])
 
   const handleMissingCachedSession = useCallback(() => {
     navigate(getAssistantSessionListPath(), { replace: true })
@@ -74,14 +79,15 @@ export function AssistantRedirect() {
     if (assistantDirectory) {
       setCachedAssistantSessionId(repoId, assistantDirectory, session.id)
     }
-    navigate(`/repos/${repoId}/sessions/${session.id}?assistant=1`)
+    navigate(`/repos/${repoId}/sessions/${session.id}?assistant=1`, { state: { directory: assistantDirectory } })
   })
 
-  const handleSelectSession = useCallback((sessionId: string) => {
-    if (assistantDirectory) {
-      setCachedAssistantSessionId(repoId, assistantDirectory, sessionId)
+  const handleSelectSession = useCallback((sessionId: string, directory?: string) => {
+    const selectedDirectory = directory ?? assistantDirectory
+    if (selectedDirectory) {
+      setCachedAssistantSessionId(repoId, selectedDirectory, sessionId)
     }
-    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`)
+    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`, { state: { directory: selectedDirectory } })
   }, [assistantDirectory, navigate, repoId])
 
   const handleCreateSession = async () => {

frontend/src/pages/RepoDetail.tsx

@@ -114,7 +114,7 @@ export function RepoDetail() {
   );
 
   const createSessionMutation = useCreateSession(opcodeUrl, composerDirectory, (session) => {
-    navigate(sessionUrl(session.id));
+    navigate(sessionUrl(session.id), { state: { directory: composerDirectory } });
   });
 
   const handleCreateSession = async (options?: {
@@ -149,8 +149,8 @@ export function RepoDetail() {
     setWorkspaceSelectorOpen(true);
   };
 
-  const handleSelectSession = (sessionId: string) => {
-    navigate(sessionUrl(sessionId));
+  const handleSelectSession = (sessionId: string, directory?: string) => {
+    navigate(sessionUrl(sessionId), { state: { directory: directory ?? composerDirectory } });
   };
 
   useSidebarAction('new-session', () => {

frontend/src/pages/SessionDetail.tsx

@@ -68,6 +68,7 @@ export function SessionDetail() {
   const { id, sessionId } = useParams<{ id: string; sessionId: string }>();
   const navigate = useNavigate();
   const location = useLocation();
+  const navigationDirectory = (location.state as { directory?: string } | null)?.directory;
   const repoId = Number(id) || 0;
   const isAssistantSession = new URLSearchParams(location.search).get('assistant') === '1';
   const { preferences, updateSettings } = useSettings();
@@ -119,7 +120,7 @@ export function SessionDetail() {
 
   const opcodeUrl = OPENCODE_API_ENDPOINT;
 
-  const repoDirectory = repo?.fullPath;
+  const repoDirectory = navigationDirectory ?? repo?.fullPath;
   const sessionRouteSuffix = isAssistantSession ? '?assistant=1' : '';
 
   useEffect(() => {
@@ -244,7 +245,7 @@ export function SessionDetail() {
         if (isAssistantSession && repoDirectory) {
           setCachedAssistantSessionId(repoId, repoDirectory, newSession.id);
         }
-        navigate(`/repos/${repoId}/sessions/${newSession.id}${sessionRouteSuffix}`);
+        navigate(`/repos/${repoId}/sessions/${newSession.id}${sessionRouteSuffix}`, { state: { directory: repoDirectory } });
       }
     } catch {
       showToast.error('Failed to create new session');
@@ -298,7 +299,7 @@ export function SessionDetail() {
       const client = createOpenCodeClient(opcodeUrl, repoDirectory);
       const forkedSession = await client.forkSession(sessionId);
       if (forkedSession?.id) {
-        navigate(`/repos/${repoId}/sessions/${forkedSession.id}${sessionRouteSuffix}`);
+        navigate(`/repos/${repoId}/sessions/${forkedSession.id}${sessionRouteSuffix}`, { state: { directory: repoDirectory } });
         showToast.success('Session forked');
       }
     } catch (error) {
@@ -375,14 +376,14 @@ export function SessionDetail() {
   }, [setFileBrowserOpen]);
 
   const handleChildSessionClick = useCallback((childSessionId: string) => {
-    navigate(`/repos/${repoId}/sessions/${childSessionId}${sessionRouteSuffix}`)
-  }, [navigate, repoId, sessionRouteSuffix]);
+    navigate(`/repos/${repoId}/sessions/${childSessionId}${sessionRouteSuffix}`, { state: { directory: repoDirectory } })
+  }, [navigate, repoDirectory, repoId, sessionRouteSuffix]);
 
   const handleParentSessionClick = useCallback(() => {
     if (session?.parentID) {
-      navigate(`/repos/${repoId}/sessions/${session.parentID}${sessionRouteSuffix}`)
+      navigate(`/repos/${repoId}/sessions/${session.parentID}${sessionRouteSuffix}`, { state: { directory: repoDirectory } })
     }
-  }, [navigate, repoId, session?.parentID, sessionRouteSuffix]);
+  }, [navigate, repoDirectory, repoId, session?.parentID, sessionRouteSuffix]);
 
   const handleToggleDetails = useCallback(() => {
     const newValue = !preferences?.expandToolCalls
@@ -590,8 +591,8 @@ export function SessionDetail() {
                 opcodeUrl={opcodeUrl}
                 directory={repoDirectory}
                 activeSessionID={sessionId || undefined}
-                onSelectSession={(sessionID) => {
-                  navigate(`/repos/${repoId}/sessions/${sessionID}${sessionRouteSuffix}`)
+                onSelectSession={(sessionID, directory) => {
+                  navigate(`/repos/${repoId}/sessions/${sessionID}${sessionRouteSuffix}`, { state: { directory: directory ?? repoDirectory } })
                   setSessionsDialogOpen(false)
                 }}
               />