- {vm.error} -
+ Impossible de recharger la conversation. + + )} {/* ── Thread ── */} diff --git a/frontend/src/features/conversations/useConversationThread.ts b/frontend/src/features/conversations/useConversationThread.ts index d68cbebe..1e1e1bc4 100644 --- a/frontend/src/features/conversations/useConversationThread.ts +++ b/frontend/src/features/conversations/useConversationThread.ts @@ -151,10 +151,9 @@ export function useConversationThread( // (Re)open whenever the target conversation changes. useEffect(() => { - setBuffer([]); setHasMore(false); void open(); - }, [open, setBuffer]); + }, [open]); return { turns, busy, error, hasMore, loadOlder, refreshTail }; } diff --git a/frontend/src/features/projects/ProjectsView.ls7.test.tsx b/frontend/src/features/projects/ProjectsView.ls7.test.tsx index fe112205..9aa1d99b 100644 --- a/frontend/src/features/projects/ProjectsView.ls7.test.tsx +++ b/frontend/src/features/projects/ProjectsView.ls7.test.tsx @@ -1,8 +1,9 @@ /** * LS7 — `ProjectsView` integration: clicking a conversation in the Work panel swaps * the terminal grid for the read-only `ConversationViewer`; the back button returns - * to the grid; switching project preserves the viewer; and with no conversation - * open the terminal grid is shown unchanged (non-regression). + * to the grid; switching away hides the viewer and returning rehydrates it from the + * persisted transcript; and with no conversation open the terminal grid is shown + * unchanged (non-regression). */ import { describe, it, expect } from "vitest"; import { render, screen, fireEvent, waitFor, within } from "@testing-library/react"; @@ -186,15 +187,17 @@ describe("ProjectsView — LS7 conversation viewer integration", () => { ).toBeNull(); }); - it("keeps the viewer attached to its source project when the active project changes", async () => { + it("rehydrates the same conversation after an agent restart and a project roundtrip", async () => { const project = new MockProjectGateway(); const alpha = await project.createProject("alpha", "/p/a"); await project.createProject("beta", "/p/b"); - const reads: string[] = []; + const system = new MockSystemGateway(); + const reads: Array<{ projectId: string; conversationId: string }> = []; renderView(project, { + system, conversation: { - readPage: async (projectId) => { - reads.push(projectId); + readPage: async (projectId, conversationId) => { + reads.push({ projectId, conversationId }); return { turns: [ { @@ -225,24 +228,57 @@ describe("ProjectsView — LS7 conversation viewer integration", () => { } await waitFor(() => expect(screen.getAllByRole("tab")).toHaveLength(2)); - // Make alpha the active tab, then open its conversation viewer. + // Make alpha the active tab, then open its persisted conversation from a + // completion event carrying the stable conversation pointer. fireEvent.click(screen.getByRole("tab", { name: "alpha" })); - openPanel("Work state"); + system.emit({ + type: "backgroundTaskChanged", + projectId: alpha.id, + agentId: "agent-1", + taskId: "task-rehydrate-291", + state: "completed", + conversationId: CONV_ID, + }); fireEvent.click( - await screen.findByRole("button", { name: `open conversation ${CONV_ID}` }), + await screen.findByRole("button", { name: /Background task completed/i }), ); await screen.findByRole("button", { name: "← Retour aux terminaux" }); + await screen.findByText(`contenu du fil ${alpha.id}`); - // Switch the active project (top tab) ⇒ the viewer remains visible and - // keeps reading the conversation from the project where it was opened. + // Simulate the successful self-restart lifecycle. It must not replace the + // persisted conversation pointer with a fresh live buffer. + system.emit({ + type: "agentRestartRequested", + agentId: "agent-1", + restartId: "restart-291", + reason: null, + }); + system.emit({ + type: "agentRestartCompleted", + agentId: "agent-1", + restartId: "restart-291", + }); + + // Switching away shows beta's own surface instead of leaking alpha's viewer. fireEvent.click(screen.getByRole("tab", { name: "beta" })); + expect(await screen.findByTestId("layout-grid")).toBeTruthy(); + expect( + screen.queryByRole("button", { name: "← Retour aux terminaux" }), + ).toBeNull(); + // Returning remounts the viewer and reloads the persisted transcript with + // exactly the same project/conversation identity. + fireEvent.click(screen.getByRole("tab", { name: "alpha" })); expect( await screen.findByRole("button", { name: "← Retour aux terminaux" }), ).toBeTruthy(); expect(await screen.findByText(`contenu du fil ${alpha.id}`)).toBeTruthy(); expect(screen.queryByTestId("layout-grid")).toBeNull(); - expect(reads.every((projectId) => projectId === alpha.id)).toBe(true); + await waitFor(() => expect(reads).toHaveLength(2)); + expect(reads).toEqual([ + { projectId: alpha.id, conversationId: CONV_ID }, + { projectId: alpha.id, conversationId: CONV_ID }, + ]); }); it("keeps the viewer open when the active layout changes", async () => { diff --git a/frontend/src/features/projects/ProjectsView.tsx b/frontend/src/features/projects/ProjectsView.tsx index 58abf9c8..a43c4476 100644 --- a/frontend/src/features/projects/ProjectsView.tsx +++ b/frontend/src/features/projects/ProjectsView.tsx @@ -247,6 +247,8 @@ export function ProjectsView() { const [taskToasts, setTaskToasts] = useState