fix: cache assistant directory separately to handle repo-not-loaded edge case

Author: chriswritescode-dev

frontend/src/hooks/useAssistantSessionLauncher.test.tsx

@@ -1,6 +1,6 @@
 import { renderHook, act } from '@testing-library/react'
 import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { useAssistantSessionLauncher } from './useAssistantSessionLauncher'
+import { getCachedAssistantDirectory, setCachedAssistantSessionId, useAssistantSessionLauncher } from './useAssistantSessionLauncher'
 import { OpenCodeClient } from '@/api/opencode'
 
 const mocks = vi.hoisted(() => ({
@@ -111,6 +111,12 @@ describe('useAssistantSessionLauncher', () => {
     expect(mocks.sendPromptAsync).not.toHaveBeenCalled()
   })
 
+  it('reads the cached assistant directory from the cached session key', () => {
+    setCachedAssistantSessionId(123, '/assistant', 'cached')
+
+    expect(getCachedAssistantDirectory(123)).toBe('/assistant')
+  })
+
   it('uses the cache-miss callback without querying OpenCode', async () => {
     const onNavigate = vi.fn()
     const onMissingCachedSession = vi.fn()

frontend/src/hooks/useAssistantSessionLauncher.ts

@@ -15,6 +15,7 @@ type OpenCodeSession = components['schemas']['Session']
 const ASSISTANT_SESSION_LOOKUP_PAGE_SIZE = 25
 
 const LAST_ASSISTANT_SESSION_KEY_PREFIX = 'ocm:assistant:last-session'
+const LAST_ASSISTANT_DIRECTORY_KEY_PREFIX = 'ocm:assistant:last-directory'
 
 function getLastAssistantSessionKey(repoId: number, directory: string): string {
   return `${LAST_ASSISTANT_SESSION_KEY_PREFIX}:${repoId}:${directory}`
@@ -23,6 +24,7 @@ function getLastAssistantSessionKey(repoId: number, directory: string): string {
 export function setCachedAssistantSessionId(repoId: number, directory: string, sessionId: string): void {
   try {
     localStorage.setItem(getLastAssistantSessionKey(repoId, directory), sessionId)
+    localStorage.setItem(`${LAST_ASSISTANT_DIRECTORY_KEY_PREFIX}:${repoId}`, directory)
   } catch {
     return
   }
@@ -36,6 +38,25 @@ function getCachedAssistantSessionId(repoId: number, directory: string): string
   }
 }
 
+export function getCachedAssistantDirectory(repoId: number): string | undefined {
+  try {
+    const cachedDirectory = localStorage.getItem(`${LAST_ASSISTANT_DIRECTORY_KEY_PREFIX}:${repoId}`)
+    if (cachedDirectory) return cachedDirectory
+
+    const prefix = `${LAST_ASSISTANT_SESSION_KEY_PREFIX}:${repoId}:`
+    const storageKeys = [
+      ...Array.from({ length: localStorage.length }, (_, index) => localStorage.key(index)),
+      ...Object.keys(localStorage),
+    ]
+    for (const key of storageKeys) {
+      if (key?.startsWith(prefix)) return key.slice(prefix.length)
+    }
+    return undefined
+  } catch {
+    return undefined
+  }
+}
+
 function isAssistantRootSession(session: OpenCodeSession, assistantDirectory: string): boolean {
   return !session.parentID && session.directory === assistantDirectory
 }

frontend/src/pages/AssistantRedirect.tsx

@@ -3,7 +3,7 @@ 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 { getCachedAssistantDirectory, setCachedAssistantSessionId, useAssistantSessionLauncher } from "@/hooks/useAssistantSessionLauncher"
 import { useCreateSession } from "@/hooks/useOpenCode"
 import { useDialogParam } from "@/hooks/useDialogParam"
 import { useSSE } from "@/hooks/useSSE"
@@ -36,6 +36,7 @@ export function AssistantRedirect() {
   const [switchConfigOpen, setSwitchConfigOpen] = useState(false)
   const [status, setStatus] = useState<"preparing" | "opening" | "creating" | "error">("preparing")
   const [errorMessage, setErrorMessage] = useState<string | null>(null)
+  const cachedAssistantDirectory = getCachedAssistantDirectory(repoId)
 
   const opcodeUrl = OPENCODE_API_ENDPOINT
   const { data: repo, isLoading: repoLoading, error: repoError } = useQuery({
@@ -44,19 +45,20 @@ export function AssistantRedirect() {
   })
 
   const handleNavigate = useCallback((sessionId: string) => {
-    if (repo?.fullPath) {
-      setCachedAssistantSessionId(repoId, repo.fullPath, sessionId)
+    const directory = repo?.fullPath ?? cachedAssistantDirectory
+    if (directory) {
+      setCachedAssistantSessionId(repoId, directory, sessionId)
       void queryClient.prefetchQuery({
-        queryKey: messagesQueryKey(opcodeUrl, sessionId, repo.fullPath),
-        queryFn: () => new OpenCodeClient(opcodeUrl, repo.fullPath).listMessages(sessionId),
+        queryKey: messagesQueryKey(opcodeUrl, sessionId, directory),
+        queryFn: () => new OpenCodeClient(opcodeUrl, directory).listMessages(sessionId),
       })
     }
     setStatus("opening")
     if (!showSessionList) {
       window.history.replaceState(window.history.state, "", getSessionListPath(repoId, true))
     }
-    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`, { state: { directory: repo?.fullPath } })
-  }, [navigate, opcodeUrl, queryClient, repo?.fullPath, repoId, showSessionList])
+    navigate(`/repos/${repoId}/sessions/${sessionId}?assistant=1`, { state: { directory } })
+  }, [cachedAssistantDirectory, navigate, opcodeUrl, queryClient, repo?.fullPath, repoId, showSessionList])
 
   const handleMissingCachedSession = useCallback(() => {
     navigate(getAssistantSessionListPath(), { replace: true })
@@ -70,7 +72,7 @@ export function AssistantRedirect() {
     onMissingCachedSession: handleMissingCachedSession,
   })
 
-  const assistantDirectory = repo?.fullPath
+  const assistantDirectory = repo?.fullPath ?? cachedAssistantDirectory
   const assistantFileBasePath = assistantDirectory?.split('/').filter(Boolean).at(-1)
 
   useSSE(opcodeUrl, assistantDirectory)
@@ -101,8 +103,8 @@ export function AssistantRedirect() {
       try {
         if (showSessionList) return
         setStatus("preparing")
-        if (repoLoading) return
-        if (repoError || !repo?.fullPath) throw new Error("Failed to load Assistant workspace")
+        if (repoLoading && !assistantDirectory) return
+        if ((repoError && !assistantDirectory) || !assistantDirectory) throw new Error("Failed to load Assistant workspace")
         if (cancelled) return
         setStatus("creating")
         await openAssistant()
@@ -118,7 +120,7 @@ export function AssistantRedirect() {
     return () => {
       cancelled = true
     }
-  }, [repo?.fullPath, repoError, repoLoading, openAssistant, showSessionList])
+  }, [assistantDirectory, repoError, repoLoading, openAssistant, showSessionList])
 
   if (showSessionList) {
     return (
@@ -140,9 +142,9 @@ export function AssistantRedirect() {
           </Header.Actions>
         </Header>
         <div className="flex-1 flex flex-col min-h-0">
-          {repoError ? (
+          {repoError && !assistantDirectory ? (
             <div className="p-4 text-sm text-muted-foreground">Failed to load Assistant sessions</div>
-          ) : repoLoading || !repo?.fullPath ? (
+          ) : repoLoading && !assistantDirectory ? (
             <div className="p-4 text-sm text-muted-foreground">Loading Assistant sessions...</div>
           ) : (
             <SessionList

frontend/src/pages/SessionDetail.tsx

@@ -419,7 +419,7 @@ export function SessionDetail() {
     return <Navigate to="/" replace />;
   }
 
-  if (!repo && !isAssistantSession) {
+  if (!repo && !isAssistantSession && !repoDirectory) {
     return (
       <div className="flex items-center justify-center min-h-screen bg-gradient-to-br from-background via-background to-background">
         <div className="flex flex-col items-center gap-2">
@@ -493,7 +493,7 @@ export function SessionDetail() {
 
       <div className="relative flex-1 overflow-hidden flex flex-col">
         <div key={sessionId} ref={messageContainerRef} className="flex-1 overflow-y-auto overflow-x-hidden overscroll-contain [mask-image:linear-gradient(to_bottom,transparent,black_16px,black)]" style={{ paddingBottom: promptOverlayHeight + inputBottomOffset + PROMPT_OVERLAY_CLEARANCE_PX }}>
-          {repoLoading || !repoDirectory || sessionLoading || messagesLoading ? (
+          {(!repoDirectory && repoLoading) || !repoDirectory || sessionLoading || messagesLoading ? (
             <MessageSkeleton />
           ) : opcodeUrl && repoDirectory ? (
             <MessageThread 

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

@@ -128,6 +128,14 @@ vi.mock('@/components/file-browser/FileBrowserSheet', () => ({
   FileBrowserSheet: vi.fn(() => null),
 }))
 
+vi.mock('@/components/message/MessageSkeleton', () => ({
+  MessageSkeleton: vi.fn(() => <div>Messages loading skeleton</div>),
+}))
+
+vi.mock('@/components/message/MessageThread', () => ({
+  MessageThread: vi.fn(() => <div>Messages rendered</div>),
+}))
+
 vi.mock('@/components/repo/RepoMcpDialog', () => ({
   RepoMcpDialog: vi.fn(() => null),
 }))
@@ -237,4 +245,17 @@ describe('SessionDetail first-load navigation directory', () => {
     const sessionCall = mocks.useSession.mock.calls[mocks.useSession.mock.calls.length - 1]
     expect(sessionCall?.[2]).toBeUndefined()
   })
+
+  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',
+      state: { directory: '/abs/assistant' },
+    })
+
+    await waitFor(() => {
+      expect(getByText('Messages rendered')).toBeTruthy()
+    })
+
+    expect(queryByText('Messages loading skeleton')).toBeNull()
+  })
 })