diff --git a/apps/web/components/task/chat/message-list-native.tsx b/apps/web/components/task/chat/message-list-native.tsx index a566efd9eb..e609837335 100644 --- a/apps/web/components/task/chat/message-list-native.tsx +++ b/apps/web/components/task/chat/message-list-native.tsx @@ -12,6 +12,7 @@ import { MessageListStatus, MessageItem, getItemKey, + getConversationLoadingState, getSessionRunningState, getLastTurnGroupId, } from "./message-list-shared"; @@ -186,10 +187,12 @@ export const NativeMessageList = memo(function NativeMessageList({ }: MessageListProps) { const scrollRef = useRef(null); - const isInitialLoading = messagesLoading && messages.length === 0; - const isNonLoadableSession = - !sessionState || ["CREATED", "FAILED", "COMPLETED", "CANCELLED"].includes(sessionState); - const showLoadingState = isInitialLoading && !isWorking && !isNonLoadableSession; + const { isInitialLoading, showLoadingState } = getConversationLoadingState({ + messagesLoading, + messagesCount: messages.length, + isWorking, + sessionState, + }); const { loadMore, hasMore, isLoading: isLoadingMore } = useLazyLoadMessages(sessionId); const isRunning = getSessionRunningState(sessionState); const lastTurnGroupId = useMemo(() => getLastTurnGroupId(items), [items]); diff --git a/apps/web/components/task/chat/message-list-shared.test.tsx b/apps/web/components/task/chat/message-list-shared.test.tsx index 45e62ffaeb..78ca1670d3 100644 --- a/apps/web/components/task/chat/message-list-shared.test.tsx +++ b/apps/web/components/task/chat/message-list-shared.test.tsx @@ -61,7 +61,7 @@ vi.mock("@/lib/api/domains/session-api", () => ({ dismissLastAgentError: vi.fn(), })); -import { MessageItem } from "./message-list-shared"; +import { MessageItem, MessageListStatus, getConversationLoadingState } from "./message-list-shared"; const item: RenderItem = { type: "message", message: { id: "m1" } as Message }; const noop = () => {}; @@ -143,3 +143,76 @@ describe("MessageItem agent error notice", () => { expect(screen.queryByText("agent process exited")).not.toBeNull(); }); }); + +describe("getConversationLoadingState", () => { + it("shows loading while conversation history is still fetching with initial content rendered", () => { + expect( + getConversationLoadingState({ + messagesLoading: true, + messagesCount: 1, + isWorking: false, + sessionState: "COMPLETED", + }), + ).toEqual({ isInitialLoading: false, showLoadingState: true }); + }); + + it("shows an initial loading state when no messages are rendered yet", () => { + expect( + getConversationLoadingState({ + messagesLoading: true, + messagesCount: 0, + isWorking: false, + sessionState: "RUNNING", + }), + ).toEqual({ isInitialLoading: true, showLoadingState: true }); + }); + + it("does not compete with the active agent status while the session is working", () => { + expect( + getConversationLoadingState({ + messagesLoading: true, + messagesCount: 1, + isWorking: true, + sessionState: "RUNNING", + }), + ).toEqual({ isInitialLoading: false, showLoadingState: false }); + }); + + it("suppresses loading for empty sessions that cannot load conversation history", () => { + expect( + getConversationLoadingState({ + messagesLoading: true, + messagesCount: 0, + isWorking: false, + sessionState: "FAILED", + }), + ).toEqual({ isInitialLoading: true, showLoadingState: false }); + + expect( + getConversationLoadingState({ + messagesLoading: true, + messagesCount: 0, + isWorking: false, + sessionState: null, + }), + ).toEqual({ isInitialLoading: true, showLoadingState: false }); + }); +}); + +describe("MessageListStatus", () => { + it("renders a conversation loading indicator while existing content remains visible", () => { + render( + , + ); + + expect(screen.queryByTestId("conversation-loading-state")).not.toBeNull(); + expect(screen.queryByText("Loading conversation...")).not.toBeNull(); + }); +}); diff --git a/apps/web/components/task/chat/message-list-shared.tsx b/apps/web/components/task/chat/message-list-shared.tsx index 9698d70f8a..5eb6f6289d 100644 --- a/apps/web/components/task/chat/message-list-shared.tsx +++ b/apps/web/components/task/chat/message-list-shared.tsx @@ -55,6 +55,28 @@ export function getLastTurnGroupId(items: RenderItem[]) { return null; } +export function getConversationLoadingState(params: { + messagesLoading: boolean; + messagesCount: number; + isWorking: boolean; + sessionState?: TaskSessionState | null; +}) { + const isInitialLoading = params.messagesLoading && params.messagesCount === 0; + const isNonLoadableSession = + !params.sessionState || + params.sessionState === "CREATED" || + params.sessionState === "FAILED" || + params.sessionState === "COMPLETED" || + params.sessionState === "CANCELLED"; + return { + isInitialLoading, + showLoadingState: + params.messagesLoading && + !params.isWorking && + (params.messagesCount > 0 || !isNonLoadableSession), + }; +} + // The chat banner stays visible until the user explicitly dismisses it, even // after the agent resumes — so the user can read the full error message at // their own pace. The sidebar icon, by contrast, also auto-hides once the @@ -163,9 +185,12 @@ export function MessageListStatus({ )} {showLoadingState && ( -
+
- Loading messages... + Loading conversation...
)} {!messagesLoading && !isInitialLoading && messagesCount === 0 && ( diff --git a/apps/web/components/task/chat/message-list-virtuoso.tsx b/apps/web/components/task/chat/message-list-virtuoso.tsx index b86e1cabb9..26c560eb40 100644 --- a/apps/web/components/task/chat/message-list-virtuoso.tsx +++ b/apps/web/components/task/chat/message-list-virtuoso.tsx @@ -14,6 +14,7 @@ import { MessageListStatus, MessageItem, getItemKey, + getConversationLoadingState, getSessionRunningState, getLastTurnGroupId, } from "./message-list-shared"; @@ -443,11 +444,12 @@ export const VirtuosoMessageList = memo(function VirtuosoMessageList(props: Mess sessionState, } = props; const { scrollParent, setScrollRef } = useVisibleScrollParent(); - const isInitialLoading = messagesLoading && messages.length === 0; - const isNonLoadableSession = - !sessionState || ["CREATED", "FAILED", "COMPLETED", "CANCELLED"].includes(sessionState); - const showLoadingState = - (messagesLoading || isInitialLoading) && !isWorking && !isNonLoadableSession; + const { isInitialLoading, showLoadingState } = getConversationLoadingState({ + messagesLoading, + messagesCount: messages.length, + isWorking, + sessionState, + }); const { loadMore, hasMore, isLoading: isLoadingMore } = useLazyLoadMessages(sessionId); const isRunning = getSessionRunningState(sessionState); const lastTurnGroupId = useMemo(() => getLastTurnGroupId(items), [items]); diff --git a/apps/web/components/task/task-page-content-helpers.test.ts b/apps/web/components/task/task-page-content-helpers.test.ts index 0e72f4a574..80d5ab14f4 100644 --- a/apps/web/components/task/task-page-content-helpers.test.ts +++ b/apps/web/components/task/task-page-content-helpers.test.ts @@ -1,6 +1,11 @@ import { describe, expect, it } from "vitest"; import type { Task } from "@/lib/types/http"; -import { buildDebugEntries, resolveTaskProps } from "./task-page-content-helpers"; +import { + buildDebugEntries, + hasResolvedTaskDetails, + resolveTaskContentState, + resolveTaskProps, +} from "./task-page-content-helpers"; function baseParams(overrides: Partial[0]> = {}) { return { @@ -61,3 +66,87 @@ describe("resolveTaskProps", () => { expect(props.issueNumber).toBe(1470); }); }); + +describe("resolveTaskContentState", () => { + it("keeps showing the loading state until the component mounts", () => { + expect( + resolveTaskContentState({ + isMounted: false, + hasTask: false, + hasTaskLoadError: true, + }), + ).toBe("loading"); + }); + + it("surfaces task load failures after mount", () => { + expect( + resolveTaskContentState({ + isMounted: true, + hasTask: false, + hasTaskLoadError: true, + }), + ).toBe("error"); + }); + + it("surfaces task load failures even when a placeholder task exists", () => { + expect( + resolveTaskContentState({ + isMounted: true, + hasTask: true, + hasTaskLoadError: true, + }), + ).toBe("error"); + }); + + it("treats a resolved task as ready", () => { + expect( + resolveTaskContentState({ + isMounted: true, + hasTask: true, + hasTaskLoadError: false, + }), + ).toBe("ready"); + }); +}); + +describe("hasResolvedTaskDetails", () => { + it("returns true when fetched details match the effective task", () => { + expect( + hasResolvedTaskDetails({ + effectiveTaskId: "task-1", + taskDetailsId: "task-1", + initialTaskId: null, + }), + ).toBe(true); + }); + + it("returns true when SSR task details match the effective task", () => { + expect( + hasResolvedTaskDetails({ + effectiveTaskId: "task-1", + taskDetailsId: null, + initialTaskId: "task-1", + }), + ).toBe(true); + }); + + it("returns false for kanban-only placeholder tasks", () => { + expect( + hasResolvedTaskDetails({ + effectiveTaskId: "task-1", + taskDetailsId: "task-2", + initialTaskId: null, + }), + ).toBe(false); + }); + + it("returns false when there is no effective task", () => { + expect( + hasResolvedTaskDetails({ + effectiveTaskId: null, + taskDetailsId: "task-1", + initialTaskId: "task-1", + }), + ).toBe(false); + }); +}); diff --git a/apps/web/components/task/task-page-content-helpers.ts b/apps/web/components/task/task-page-content-helpers.ts index b1bdcea16a..1a0c4b3611 100644 --- a/apps/web/components/task/task-page-content-helpers.ts +++ b/apps/web/components/task/task-page-content-helpers.ts @@ -104,6 +104,29 @@ export function buildArchivedValue(task: Task | null, repository: Repository | n }; } +export function resolveTaskContentState(params: { + isMounted: boolean; + hasTask: boolean; + hasTaskLoadError: boolean; +}) { + if (!params.isMounted) return "loading"; + if (params.hasTaskLoadError) return "error"; + if (params.hasTask) return "ready"; + return "loading"; +} + +export function hasResolvedTaskDetails(params: { + effectiveTaskId: string | null; + taskDetailsId?: string | null; + initialTaskId?: string | null; +}) { + if (!params.effectiveTaskId) return false; + return ( + params.taskDetailsId === params.effectiveTaskId || + params.initialTaskId === params.effectiveTaskId + ); +} + export function resolveTaskIds(task: Task | null) { return { taskId: task?.id ?? null, diff --git a/apps/web/components/task/task-page-content.tsx b/apps/web/components/task/task-page-content.tsx index d0f16ffd22..8530680829 100644 --- a/apps/web/components/task/task-page-content.tsx +++ b/apps/web/components/task/task-page-content.tsx @@ -1,6 +1,7 @@ "use client"; import { useEffect, useMemo, useState } from "react"; +import { IconAlertTriangle } from "@tabler/icons-react"; import { taskId as toTaskId, workflowId as toWorkflowId, @@ -25,8 +26,11 @@ import type { Layout } from "react-resizable-panels"; import { deriveIsAgentWorking, buildArchivedValue, + hasResolvedTaskDetails, + resolveTaskContentState, } from "@/components/task/task-page-content-helpers"; import { TaskPageInner } from "@/components/task/task-page-inner"; +import { GridSpinner } from "@/components/grid-spinner"; type TaskPageContentProps = { task: Task | null; @@ -202,8 +206,42 @@ function syncActiveTaskSession(params: { else params.setActiveTask(taskId); } +function TaskLoadingState() { + return ( +
+
+ + Loading task... +
+
+ ); +} + +function TaskLoadErrorState() { + return ( +
+
+
+
+ ); +} + function useTaskDetails(activeTaskId: string | null, initialTask: Task | null) { const [taskDetails, setTaskDetails] = useState(initialTask); + const [taskLoadError, setTaskLoadError] = useState(null); const kanbanTask = useAppStore((state) => activeTaskId ? (state.kanban.tasks.find( @@ -216,13 +254,34 @@ function useTaskDetails(activeTaskId: string | null, initialTask: Task | null) { () => resolveEffectiveTask(taskDetails, initialTask, kanbanTask, effectiveTaskId), [taskDetails, initialTask, kanbanTask, effectiveTaskId], ); + const hasTaskDetails = hasResolvedTaskDetails({ + effectiveTaskId, + taskDetailsId: taskDetails?.id ?? null, + initialTaskId: initialTask?.id ?? null, + }); useTasks(task?.workflow_id ?? null); useEffect(() => { - if (!activeTaskId || taskDetails?.id === activeTaskId) return; + if (!activeTaskId || taskDetails?.id === activeTaskId) { + setTaskLoadError(null); + return; + } + let cancelled = false; + setTaskLoadError(null); fetchTask(activeTaskId, { cache: "no-store" }) - .then((response) => setTaskDetails(response)) - .catch((error) => console.error("[TaskPageContent] Failed to load task details:", error)); + .then((response) => { + if (cancelled) return; + setTaskDetails(response); + setTaskLoadError(null); + }) + .catch((error) => { + if (cancelled) return; + console.error("[TaskPageContent] Failed to load task details:", error); + setTaskLoadError(error); + }); + return () => { + cancelled = true; + }; }, [ activeTaskId, taskDetails?.id, @@ -232,7 +291,7 @@ function useTaskDetails(activeTaskId: string | null, initialTask: Task | null) { setTaskDetails, ]); - return { task, kanbanTask }; + return { task, kanbanTask, taskLoadError: hasTaskDetails ? null : taskLoadError }; } function useTaskPageData( @@ -254,7 +313,7 @@ function useTaskPageData( return session?.task_id === activeTaskId ? sid : null; }); - const { task } = useTaskDetails(activeTaskId, initialTask); + const { task, taskLoadError } = useTaskDetails(activeTaskId, initialTask); const agent = useSessionAgent(task); const ensureSession = useEnsureTaskSession(task); @@ -281,7 +340,7 @@ function useTaskPageData( [effectiveRepositories, task?.repositories], ); - return { task, agent, effectiveSessionId, repository, ensureSession }; + return { task, taskLoadError, agent, effectiveSessionId, repository, ensureSession }; } export function TaskPageContent({ @@ -300,12 +359,8 @@ export function TaskPageContent({ const { isMobile } = useResponsiveBreakpoint(); const connectionStatus = useAppStore((state) => state.connection.status); - const { task, agent, effectiveSessionId, repository, ensureSession } = useTaskPageData( - initialTask, - initialTaskId, - sessionId, - initialRepositories, - ); + const { task, taskLoadError, agent, effectiveSessionId, repository, ensureSession } = + useTaskPageData(initialTask, initialTaskId, sessionId, initialRepositories); const workflowSteps = useWorkflowStepsMapped(); const sessionPanel = useSessionPanelState(effectiveSessionId); @@ -321,7 +376,15 @@ export function TaskPageContent({ queueMicrotask(() => setIsMounted(true)); }, []); - if (!isMounted || !task) return
; + const contentState = resolveTaskContentState({ + isMounted, + hasTask: Boolean(task), + hasTaskLoadError: Boolean(taskLoadError), + }); + + if (contentState === "loading") return ; + if (contentState === "error") return ; + if (!task) return ; return ( { + test("shows a spinner instead of a blank task detail pane while task data loads", async ({ + testPage, + apiClient, + seedData, + }) => { + const unblockTaskDetailRequest = await openBlockedTaskLoadingState({ + testPage, + apiClient, + seedData, + title: "Mobile Task Loading State Anchor", + unresolvedTaskId: "unresolved-task-detail-mobile", + }); + + try { + await expect(testPage.getByTestId("task-loading-state")).toBeVisible({ timeout: 10_000 }); + await expect(testPage.getByText("Loading task...")).toBeVisible(); + await expectLoadingStateFitsViewport(testPage); + } finally { + await unblockTaskDetailRequest(); + } + }); +}); diff --git a/apps/web/e2e/tests/task/task-loading-state-helpers.ts b/apps/web/e2e/tests/task/task-loading-state-helpers.ts new file mode 100644 index 0000000000..562973bb4d --- /dev/null +++ b/apps/web/e2e/tests/task/task-loading-state-helpers.ts @@ -0,0 +1,93 @@ +import type { Page, Route } from "@playwright/test"; +import type { ApiClient } from "../../helpers/api-client"; + +type SeedData = { + workspaceId: string; + workflowId: string; + startStepId: string; + repositoryId: string; +}; + +type E2EStoreWindow = Window & { + __KANDEV_E2E_STORE__?: { + getState: () => { + tasks: { activeTaskId: string | null }; + setActiveTask: (taskId: string) => void; + }; + }; +}; + +type OpenBlockedTaskLoadingStateParams = { + testPage: Page; + apiClient: ApiClient; + seedData: SeedData; + title: string; + unresolvedTaskId: string; +}; + +async function waitForActiveTask(testPage: Page, taskId: string) { + await testPage.waitForFunction((expectedTaskId) => { + const store = (window as E2EStoreWindow).__KANDEV_E2E_STORE__; + return store?.getState().tasks.activeTaskId === expectedTaskId; + }, taskId); +} + +async function switchToUnresolvedTask(testPage: Page, taskId: string) { + await testPage.evaluate((unresolvedTaskId) => { + const store = (window as E2EStoreWindow).__KANDEV_E2E_STORE__; + if (!store) throw new Error("E2E store bridge missing"); + store.getState().setActiveTask(unresolvedTaskId); + }, taskId); +} + +async function blockTaskDetailRequest(testPage: Page, taskId: string) { + const routePattern = `**/api/v1/tasks/${taskId}`; + let unblock: () => void = () => {}; + const blocked = new Promise((resolve) => { + unblock = resolve; + }); + let requestStarted = false; + let markHandled: () => void = () => {}; + const handled = new Promise((resolve) => { + markHandled = resolve; + }); + + const handler = async (route: Route) => { + requestStarted = true; + await blocked; + try { + await route.abort("failed").catch(() => {}); + } finally { + markHandled(); + } + }; + + await testPage.route(routePattern, handler); + + return async () => { + unblock(); + if (requestStarted) await handled; + await testPage.unroute(routePattern, handler); + }; +} + +export async function openBlockedTaskLoadingState({ + testPage, + apiClient, + seedData, + title, + unresolvedTaskId, +}: OpenBlockedTaskLoadingStateParams) { + const unblockTaskDetailRequest = await blockTaskDetailRequest(testPage, unresolvedTaskId); + const task = await apiClient.createTask(seedData.workspaceId, title, { + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }); + + await testPage.goto(`/t/${task.id}`); + await waitForActiveTask(testPage, task.id); + await switchToUnresolvedTask(testPage, unresolvedTaskId); + + return unblockTaskDetailRequest; +} diff --git a/apps/web/e2e/tests/task/task-loading-state.spec.ts b/apps/web/e2e/tests/task/task-loading-state.spec.ts new file mode 100644 index 0000000000..ff1529916b --- /dev/null +++ b/apps/web/e2e/tests/task/task-loading-state.spec.ts @@ -0,0 +1,25 @@ +import { test, expect } from "../../fixtures/test-base"; +import { openBlockedTaskLoadingState } from "./task-loading-state-helpers"; + +test.describe("Task loading state", () => { + test("shows a spinner instead of a blank task detail pane while task data loads", async ({ + testPage, + apiClient, + seedData, + }) => { + const unblockTaskDetailRequest = await openBlockedTaskLoadingState({ + testPage, + apiClient, + seedData, + title: "Task Loading State Anchor", + unresolvedTaskId: "unresolved-task-detail-desktop", + }); + + try { + await expect(testPage.getByTestId("task-loading-state")).toBeVisible({ timeout: 10_000 }); + await expect(testPage.getByText("Loading task...")).toBeVisible(); + } finally { + await unblockTaskDetailRequest(); + } + }); +});