fix: hoist assistantDirectory before useAssistantSessionLauncher, drop sessionLoading from skeleton guard

Author: chriswritescode-dev

frontend/src/pages/AssistantRedirect.tsx

@@ -64,17 +64,17 @@ export function AssistantRedirect() {
     navigate(getAssistantSessionListPath(), { replace: true })
   }, [navigate])
 
+  const assistantDirectory = repo?.fullPath ?? cachedAssistantDirectory
+  const assistantFileBasePath = assistantDirectory?.split('/').filter(Boolean).at(-1)
+
   const { openAssistant } = useAssistantSessionLauncher({
     repoId,
     opcodeUrl,
-    directory: repo?.fullPath,
+    directory: assistantDirectory,
     onNavigate: handleNavigate,
     onMissingCachedSession: handleMissingCachedSession,
   })
 
-  const assistantDirectory = repo?.fullPath ?? cachedAssistantDirectory
-  const assistantFileBasePath = assistantDirectory?.split('/').filter(Boolean).at(-1)
-
   useSSE(opcodeUrl, assistantDirectory)
 
   const createSessionMutation = useCreateSession(opcodeUrl, assistantDirectory, (session) => {

frontend/src/pages/SessionDetail.tsx

@@ -132,7 +132,7 @@ export function SessionDetail() {
   const { isConnected, isReconnecting } = useSSE(opcodeUrl, repoDirectory, sessionId);
 
   const { data: rawMessages, isLoading: messagesLoading } = useMessages(opcodeUrl, sessionId, repoDirectory);
-  const { data: session, isLoading: sessionLoading } = useSession(
+  const { data: session } = useSession(
     opcodeUrl,
     sessionId,
     repoDirectory,
@@ -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 }}>
-          {(!repoDirectory && repoLoading) || !repoDirectory || sessionLoading || messagesLoading ? (
+          {(!repoDirectory && repoLoading) || !repoDirectory || messagesLoading ? (
             <MessageSkeleton />
           ) : opcodeUrl && repoDirectory ? (
             <MessageThread 

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

@@ -258,4 +258,19 @@ describe('SessionDetail first-load navigation directory', () => {
 
     expect(queryByText('Messages loading skeleton')).toBeNull()
   })
+
+  it('renders assistant messages while session metadata is still loading', async () => {
+    mocks.useSession.mockReturnValue({ data: undefined, isLoading: true })
+
+    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()
+  })
 })