Remove flagged comments and guard early-return against empty-page flash

Author: chriswritescode-dev

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

@@ -230,6 +230,23 @@ describe('SessionList', () => {
     expect(screen.getByText('Click here to start a new session')).toBeTruthy()
   })
 
+  it('shows loading state instead of create-session card when the first page is empty but more pages are pending', () => {
+    sessionsData.splice(0, sessionsData.length)
+    hasNextPageRef.current = true
+
+    render(
+      <SessionList
+        opcodeUrl="/api/opencode"
+        directories={['/w/a']}
+        onSelectSession={vi.fn()}
+      />,
+    )
+
+    expect(screen.getByText('Loading sessions...')).toBeTruthy()
+    expect(screen.queryByText('No sessions yet')).toBeNull()
+    expect(screen.queryByText('Click here to start a new session')).toBeNull()
+  })
+
   it('auto-fetches next page when all visible sessions are filtered out as child sessions', async () => {
     sessionsData.splice(0, sessionsData.length,
       { id: 'child1', title: 'child session', directory: '/w/a', parentID: 'parent1', time: { updated: Date.now() } },

frontend/src/components/session/SessionList.tsx

@@ -98,7 +98,9 @@ export const SessionList = ({
   }
 
   if (!sessions || sessions.length === 0) {
-    // If user is searching, fall through to main render which shows "No sessions found"
+    if (hasNextPage || isFetchingNextPage) {
+      return <div className="p-4 text-sm text-muted-foreground">Loading sessions...</div>;
+    }
     if (!searchQuery.trim()) {
       return (
         <div className="flex-1 overflow-y-auto overflow-x-hidden px-4 pt-4 pb-4 min-h-0 [mask-image:linear-gradient(to_bottom,transparent,black_16px,black)]">

frontend/src/contexts/EventContext.tsx

@@ -233,7 +233,6 @@ export function EventProvider({ children }: { children: React.ReactNode }) {
         const sessionsData = query.state.data
         if (!sessionsData) continue
 
-        // Handle legacy Session[] (plain array)
         if (Array.isArray(sessionsData)) {
           const found = sessionsData.find((s: { id: string }) => s.id === sessionID)
           if (found) {
@@ -243,7 +242,6 @@ export function EventProvider({ children }: { children: React.ReactNode }) {
           continue
         }
 
-        // Handle infinite-query InfiniteData<{ items: Session[] }> shape
         if (typeof sessionsData === 'object' && 'pages' in sessionsData) {
           const infiniteData = sessionsData as { pages: Array<{ items: Array<{ id: string; directory?: string }> }> }
           for (const page of infiniteData.pages) {