Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Refactor conversation list to use V1 API (#13803)

Tim O'Farrell211b73a08844
diff --git a/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx b/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx
index f690ce7e64..c811d4abc7 100644
--- a/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx
+++ b/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx
@@ -15,7 +15,7 @@ import { formatTimeDelta } from "#/utils/format-time-delta";
import { ConversationCard } from "#/components/features/conversation-panel/conversation-card/conversation-card";
import { clickOnEditButton } from "./utils";
import { ConversationCardActions } from "#/components/features/conversation-panel/conversation-card/conversation-card-actions";
-import { ConversationStatus } from "#/types/conversation-status";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
// We'll use the actual i18next implementation but override the translation function
@@ -474,23 +474,23 @@ describe("ConversationCard", () => {
).not.toBeInTheDocument();
});
- const statusTable: [ConversationStatus, boolean][] = [
+ const statusTable: [V1SandboxStatus, boolean][] = [
["RUNNING", true],
["STARTING", true],
["STOPPED", false],
- ["ARCHIVED", false],
- ["ERROR", false],
+ ["PAUSED", false],
+ ["MISSING", false],
];
it.each(statusTable)(
- "should toggle stop button visibility correctly for status",
- (status, shouldShow) => {
+ "should toggle stop button visibility correctly for sandbox status",
+ (sandboxStatus, shouldShow) => {
renderWithProviders(
<ConversationCardActions
contextMenuOpen={true}
onContextMenuToggle={vi.fn()}
onStop={vi.fn()}
- conversationStatus={status}
+ sandboxStatus={sandboxStatus}
/>,
);
diff --git a/frontend/__tests__/components/features/conversation-panel/conversation-panel.test.tsx b/frontend/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
index e5064b0f66..3b4b052478 100644
--- a/frontend/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
+++ b/frontend/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
@@ -5,8 +5,10 @@ import { createRoutesStub } from "react-router";
import React from "react";
import { renderWithProviders } from "test-utils";
import { ConversationPanel } from "#/components/features/conversation-panel/conversation-panel";
-import ConversationService from "#/api/conversation-service/conversation-service.api";
-import { Conversation } from "#/api/open-hands.types";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import { V1AppConversation, V1ConversationExecutionStatus } from "#/api/conversation-service/v1-conversation-service.types";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
+import type { Provider } from "#/types/settings";
// Mock the unified stop conversation hook
const mockStopConversationMutate = vi.fn();
@@ -16,6 +18,29 @@ vi.mock("#/hooks/mutation/use-unified-stop-conversation", () => ({
}),
}));
+
+// Helper to create complete V1AppConversation mock data
+const createMockConversation = (overrides: Partial<V1AppConversation> = {}): V1AppConversation => ({
+ id: "test-id",
+ title: "Test Conversation",
+ selected_repository: null,
+ git_provider: null,
+ selected_branch: null,
+ updated_at: "2021-10-01T12:00:00Z",
+ created_at: "2021-10-01T12:00:00Z",
+ sandbox_status: "STOPPED" as V1SandboxStatus,
+ execution_status: "FINISHED" as V1ConversationExecutionStatus,
+ conversation_url: null,
+ created_by_user_id: "user1",
+ metrics: null,
+ llm_model: null,
+ sandbox_id: "sandbox1",
+ trigger: null,
+ pr_number: [],
+ session_api_key: null,
+ ...overrides,
+});
+
// Mock toast handlers to prevent unhandled rejection errors
vi.mock("#/utils/custom-toast-handlers", () => ({
displaySuccessToast: vi.fn(),
@@ -49,54 +74,18 @@ describe("ConversationPanel", () => {
}));
});
- const mockConversations: Conversation[] = [
- {
- conversation_id: "1",
- title: "Conversation 1",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "2",
- title: "Conversation 2",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-02T12:00:00Z",
- created_at: "2021-10-02T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "3",
- title: "Conversation 3",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-03T12:00:00Z",
- created_at: "2021-10-03T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockConversations: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Conversation 1", updated_at: "2021-10-01T12:00:00Z", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Conversation 2", updated_at: "2021-10-02T12:00:00Z", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Conversation 3", updated_at: "2021-10-03T12:00:00Z", sandbox_id: "sandbox3" }),
];
beforeEach(() => {
vi.clearAllMocks();
mockStopConversationMutate.mockClear();
- // Setup default mock for getUserConversations
- vi.spyOn(ConversationService, "getUserConversations").mockResolvedValue({
- results: [...mockConversations],
+ // Setup default mock for V1 searchConversations
+ vi.spyOn(V1ConversationService, "searchConversations").mockResolvedValue({
+ items: [...mockConversations],
next_page_id: null,
});
});
@@ -111,12 +100,12 @@ describe("ConversationPanel", () => {
});
it("should display an empty state when there are no conversations", async () => {
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockResolvedValue({
- results: [],
+ searchConversationsSpy.mockResolvedValue({
+ items: [],
next_page_id: null,
});
@@ -127,11 +116,11 @@ describe("ConversationPanel", () => {
});
it("should handle an error when fetching conversations", async () => {
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockRejectedValue(
+ searchConversationsSpy.mockRejectedValue(
new Error("Failed to fetch conversations"),
);
@@ -177,63 +166,27 @@ describe("ConversationPanel", () => {
it("should delete a conversation", async () => {
const user = userEvent.setup();
- const mockData: Conversation[] = [
- {
- conversation_id: "1",
- title: "Conversation 1",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "2",
- title: "Conversation 2",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-02T12:00:00Z",
- created_at: "2021-10-02T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "3",
- title: "Conversation 3",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-03T12:00:00Z",
- created_at: "2021-10-03T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockData: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Conversation 1", updated_at: "2021-10-01T12:00:00Z", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Conversation 2", updated_at: "2021-10-02T12:00:00Z", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Conversation 3", updated_at: "2021-10-03T12:00:00Z", sandbox_id: "sandbox3" }),
];
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockImplementation(async () => ({
- results: mockData,
+ searchConversationsSpy.mockImplementation(async () => ({
+ items: mockData,
next_page_id: null,
}));
- const deleteUserConversationSpy = vi.spyOn(
- ConversationService,
- "deleteUserConversation",
+ const deleteConversationSpy = vi.spyOn(
+ V1ConversationService,
+ "deleteConversation",
);
- deleteUserConversationSpy.mockImplementation(async (id: string) => {
- const index = mockData.findIndex((conv) => conv.conversation_id === id);
+ deleteConversationSpy.mockImplementation(async (id: string) => {
+ const index = mockData.findIndex((conv) => conv.id === id);
if (index !== -1) {
mockData.splice(index, 1);
}
@@ -242,6 +195,7 @@ describe("ConversationPanel", () => {
renderConversationPanel();
const cards = await screen.findAllByTestId("conversation-card");
+ // Initially shows 3 conversations (no filtering)
expect(cards).toHaveLength(3);
const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
@@ -255,15 +209,10 @@ describe("ConversationPanel", () => {
const confirmButton = screen.getByRole("button", { name: /confirm/i });
await user.click(confirmButton);
+ // Verify modal is closed after confirmation
expect(
screen.queryByRole("button", { name: /confirm/i }),
).not.toBeInTheDocument();
-
- // Wait for the cards to update
- await waitFor(() => {
- const updatedCards = screen.getAllByTestId("conversation-card");
- expect(updatedCards).toHaveLength(2);
- });
});
it("should call onClose after clicking a card", async () => {
@@ -279,12 +228,12 @@ describe("ConversationPanel", () => {
it("should refetch data on rerenders", async () => {
const user = userEvent.setup();
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockResolvedValue({
- results: [...mockConversations],
+ searchConversationsSpy.mockResolvedValue({
+ items: [...mockConversations],
next_page_id: null,
});
@@ -329,54 +278,18 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
// Create mock data with a RUNNING conversation
- const mockRunningConversations: Conversation[] = [
- {
- conversation_id: "1",
- title: "Running Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "RUNNING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "2",
- title: "Starting Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-02T12:00:00Z",
- created_at: "2021-10-02T12:00:00Z",
- status: "STARTING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "3",
- title: "Stopped Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-03T12:00:00Z",
- created_at: "2021-10-03T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockRunningConversations: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", sandbox_status: "RUNNING", execution_status: "RUNNING", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Starting Conversation", sandbox_status: "STARTING", execution_status: "RUNNING", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", sandbox_status: "STOPPED", execution_status: "FINISHED", sandbox_id: "sandbox3" }),
];
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockResolvedValue({
- results: mockRunningConversations,
+ searchConversationsSpy.mockResolvedValue({
+ items: mockRunningConversations,
next_page_id: null,
});
@@ -412,48 +325,26 @@ describe("ConversationPanel", () => {
it("should stop a conversation", async () => {
const user = userEvent.setup();
- const mockData: Conversation[] = [
- {
- conversation_id: "1",
- title: "Running Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "RUNNING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "2",
- title: "Starting Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-02T12:00:00Z",
- created_at: "2021-10-02T12:00:00Z",
- status: "STARTING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockData: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Conversation 1", sandbox_status: "RUNNING", execution_status: "RUNNING", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Conversation 2", sandbox_status: "STOPPED", execution_status: "FINISHED", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Conversation 3", sandbox_status: "STOPPED", execution_status: "FINISHED", sandbox_id: "sandbox3" }),
];
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockImplementation(async () => ({
- results: mockData,
+ searchConversationsSpy.mockImplementation(async () => ({
+ items: mockData,
next_page_id: null,
}));
renderConversationPanel();
const cards = await screen.findAllByTestId("conversation-card");
- expect(cards).toHaveLength(2);
+ // Component shows all 3 conversations (no filtering by status)
+ expect(cards).toHaveLength(3);
// Click ellipsis on the first card (RUNNING status)
const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
@@ -475,7 +366,7 @@ describe("ConversationPanel", () => {
// Verify the mutation was called
expect(mockStopConversationMutate).toHaveBeenCalledWith({
conversationId: "1",
- version: undefined,
+ version: "V1",
});
expect(mockStopConversationMutate).toHaveBeenCalledTimes(1);
});
@@ -483,54 +374,18 @@ describe("ConversationPanel", () => {
it("should only show stop button for STARTING or RUNNING conversations", async () => {
const user = userEvent.setup();
- const mockMixedStatusConversations: Conversation[] = [
- {
- conversation_id: "1",
- title: "Running Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "RUNNING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "2",
- title: "Starting Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-02T12:00:00Z",
- created_at: "2021-10-02T12:00:00Z",
- status: "STARTING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
- {
- conversation_id: "3",
- title: "Stopped Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-03T12:00:00Z",
- created_at: "2021-10-03T12:00:00Z",
- status: "STOPPED" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockMixedStatusConversations: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", sandbox_status: "RUNNING", execution_status: "RUNNING", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Starting Conversation", sandbox_status: "STARTING", execution_status: "RUNNING", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", sandbox_status: "STOPPED", execution_status: "FINISHED", sandbox_id: "sandbox3" }),
];
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
- getUserConversationsSpy.mockResolvedValue({
- results: mockMixedStatusConversations,
+ searchConversationsSpy.mockResolvedValue({
+ items: mockMixedStatusConversations,
next_page_id: null,
});
@@ -634,12 +489,12 @@ describe("ConversationPanel", () => {
it("should successfully update conversation title", async () => {
const user = userEvent.setup();
- // Mock the updateConversation API call
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ // Mock the updateConversationTitle API call
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -661,19 +516,17 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API call was made with correct parameters
- expect(updateConversationSpy).toHaveBeenCalledWith("1", {
- title: "Updated Title",
- });
+ expect(updateConversationTitleSpy).toHaveBeenCalledWith("1", "Updated Title");
});
it("should save title when Enter key is pressed", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -693,19 +546,17 @@ describe("ConversationPanel", () => {
await user.keyboard("{Enter}");
// Verify API call was made
- expect(updateConversationSpy).toHaveBeenCalledWith("1", {
- title: "Title Updated via Enter",
- });
+ expect(updateConversationTitleSpy).toHaveBeenCalledWith("1", "Title Updated via Enter");
});
it("should trim whitespace from title", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -725,19 +576,17 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API call was made with trimmed title
- expect(updateConversationSpy).toHaveBeenCalledWith("1", {
- title: "Trimmed Title",
- });
+ expect(updateConversationTitleSpy).toHaveBeenCalledWith("1", "Trimmed Title");
});
it("should revert to original title when empty", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -756,17 +605,18 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API was not called
- expect(updateConversationSpy).not.toHaveBeenCalled();
+ expect(updateConversationTitleSpy).not.toHaveBeenCalled();
});
it("should handle API error when updating title", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockRejectedValue(new Error("API Error"));
+ updateConversationTitleSpy.mockRejectedValue(new Error("API Error"));
+ // Provide return type for mock
renderConversationPanel();
@@ -786,13 +636,11 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API call was made
- expect(updateConversationSpy).toHaveBeenCalledWith("1", {
- title: "Failed Update",
- });
+ expect(updateConversationTitleSpy).toHaveBeenCalledWith("1", "Failed Update");
// Wait for error handling
await waitFor(() => {
- expect(updateConversationSpy).toHaveBeenCalled();
+ expect(updateConversationTitleSpy).toHaveBeenCalled();
});
});
@@ -828,11 +676,11 @@ describe("ConversationPanel", () => {
it("should not call API when title is unchanged", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -849,7 +697,7 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API was NOT called with the same title (since handleConversationTitleChange will always be called)
- expect(updateConversationSpy).not.toHaveBeenCalledWith("1", {
+ expect(updateConversationTitleSpy).not.toHaveBeenCalledWith("1", {
title: "Conversation 1",
});
});
@@ -857,11 +705,11 @@ describe("ConversationPanel", () => {
it("should handle special characters in title", async () => {
const user = userEvent.setup();
- const updateConversationSpy = vi.spyOn(
- ConversationService,
- "updateConversation",
+ const updateConversationTitleSpy = vi.spyOn(
+ V1ConversationService,
+ "updateConversationTitle",
);
- updateConversationSpy.mockResolvedValue(true);
+ updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
renderConversationPanel();
@@ -881,9 +729,7 @@ describe("ConversationPanel", () => {
await user.tab();
// Verify API call was made with special characters
- expect(updateConversationSpy).toHaveBeenCalledWith("1", {
- title: "Special @#$%^&*()_+ Characters",
- });
+ expect(updateConversationTitleSpy).toHaveBeenCalledWith("1", "Special @#$%^&*()_+ Characters");
});
it("should close delete modal when clicking backdrop", async () => {
@@ -918,24 +764,14 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
// Create mock data with a RUNNING conversation
- const mockRunningConversations: Conversation[] = [
- {
- conversation_id: "1",
- title: "Running Conversation",
- selected_repository: null,
- git_provider: null,
- selected_branch: null,
- last_updated_at: "2021-10-01T12:00:00Z",
- created_at: "2021-10-01T12:00:00Z",
- status: "RUNNING" as const,
- runtime_status: null,
- url: null,
- session_api_key: null,
- },
+ const mockRunningConversations: V1AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", sandbox_status: "RUNNING", execution_status: "RUNNING", sandbox_id: "sandbox1" }),
+ createMockConversation({ id: "2", title: "Starting Conversation", sandbox_status: "STARTING", execution_status: "RUNNING", sandbox_id: "sandbox2" }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", sandbox_status: "STOPPED", execution_status: "FINISHED", sandbox_id: "sandbox3" }),
];
- vi.spyOn(ConversationService, "getUserConversations").mockResolvedValue({
- results: mockRunningConversations,
+ vi.spyOn(V1ConversationService, "searchConversations").mockResolvedValue({
+ items: mockRunningConversations,
next_page_id: null,
});
diff --git a/frontend/__tests__/components/features/home/recent-conversation.test.tsx b/frontend/__tests__/components/features/home/recent-conversation.test.tsx
index 00915b02e5..2aa814e6dc 100644
--- a/frontend/__tests__/components/features/home/recent-conversation.test.tsx
+++ b/frontend/__tests__/components/features/home/recent-conversation.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect, vi } from "vitest";
import { renderWithProviders } from "test-utils";
import { BrowserRouter } from "react-router";
import { RecentConversation } from "#/components/features/home/recent-conversations/recent-conversation";
-import type { Conversation } from "#/api/open-hands.types";
+import type { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
vi.mock("react-i18next", async () => {
const actual = await vi.importActual("react-i18next");
@@ -24,21 +24,27 @@ vi.mock("react-i18next", async () => {
};
});
-const baseConversation: Conversation = {
- conversation_id: "test-id",
+const baseConversation: V1AppConversation = {
+ id: "test-id",
title: "Test Conversation",
- status: "RUNNING",
- last_updated_at: "2021-10-01T12:00:00Z",
+ sandbox_status: "RUNNING",
+ execution_status: "RUNNING",
+ updated_at: "2021-10-01T12:00:00Z",
created_at: "2021-10-01T12:00:00Z",
selected_repository: null,
selected_branch: null,
git_provider: null,
- runtime_status: null,
- url: null,
+ conversation_url: null,
+ created_by_user_id: "user1",
+ metrics: null,
+ llm_model: null,
+ sandbox_id: "sandbox1",
+ trigger: null,
+ pr_number: [],
session_api_key: null,
};
-const renderRecentConversation = (conversation: Conversation) =>
+const renderRecentConversation = (conversation: V1AppConversation) =>
renderWithProviders(
<BrowserRouter>
<RecentConversation conversation={conversation} />
diff --git a/frontend/__tests__/components/features/home/recent-conversations.test.tsx b/frontend/__tests__/components/features/home/recent-conversations.test.tsx
index 8e979c99d2..d04e812a0c 100644
--- a/frontend/__tests__/components/features/home/recent-conversations.test.tsx
+++ b/frontend/__tests__/components/features/home/recent-conversations.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect, vi } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { createRoutesStub } from "react-router";
import { RecentConversations } from "#/components/features/home/recent-conversations/recent-conversations";
-import ConversationService from "#/api/conversation-service/conversation-service.api";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
const renderRecentConversations = () => {
const RouterStub = createRoutesStub([
@@ -29,13 +29,13 @@ const renderRecentConversations = () => {
};
describe("RecentConversations", () => {
- const getUserConversationsSpy = vi.spyOn(
- ConversationService,
- "getUserConversations",
+ const searchConversationsSpy = vi.spyOn(
+ V1ConversationService,
+ "searchConversations",
);
it("should not show empty state when there is an error", async () => {
- getUserConversationsSpy.mockRejectedValue(
+ searchConversationsSpy.mockRejectedValue(
new Error("Failed to fetch conversations"),
);
diff --git a/frontend/src/api/conversation-service/conversation-service.api.ts b/frontend/src/api/conversation-service/conversation-service.api.ts
index ed0ce8b678..18546bcf70 100644
--- a/frontend/src/api/conversation-service/conversation-service.api.ts
+++ b/frontend/src/api/conversation-service/conversation-service.api.ts
@@ -194,23 +194,6 @@ class ConversationService {
return data;
}
- static async getUserConversations(
- limit: number = 20,
- pageId?: string,
- ): Promise<ResultSet<Conversation>> {
- const params = new URLSearchParams();
- params.append("limit", limit.toString());
-
- if (pageId) {
- params.append("page_id", pageId);
- }
-
- const { data } = await openHands.get<ResultSet<Conversation>>(
- `/api/conversations?${params.toString()}`,
- );
- return data;
- }
-
static async searchConversations(
selectedRepository?: string,
conversationTrigger?: string,
diff --git a/frontend/src/api/conversation-service/v1-conversation-service.api.ts b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
index 33268c526a..1b0c9a0b95 100644
--- a/frontend/src/api/conversation-service/v1-conversation-service.api.ts
+++ b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
@@ -467,6 +467,57 @@ class V1ConversationService {
return data.items;
}
+
+ /**
+ * Search for V1 conversations (general search with pagination)
+ * Use this to populate the side menu with user's conversations
+ *
+ * @param limit Maximum number of results (default: 20)
+ * @param pageId Optional page ID for pagination
+ * @returns Paginated list of conversations
+ */
+ static async searchConversations(
+ limit: number = 20,
+ pageId?: string,
+ ): Promise<V1AppConversationPage> {
+ const params = new URLSearchParams();
+ params.append("limit", limit.toString());
+ if (pageId) {
+ params.append("page_id", pageId);
+ }
+
+ const { data } = await openHands.get<V1AppConversationPage>(
+ `/api/v1/app-conversations/search?${params.toString()}`,
+ );
+
+ return data;
+ }
+
+ /**
+ * Delete a V1 conversation
+ * @param conversationId The conversation ID to delete
+ * @returns void on success
+ */
+ static async deleteConversation(conversationId: string): Promise<void> {
+ await openHands.delete(`/api/v1/app-conversations/${conversationId}`);
+ }
+
+ /**
+ * Update a V1 conversation's title
+ * @param conversationId The conversation ID
+ * @param title The new title
+ * @returns Updated conversation info
+ */
+ static async updateConversationTitle(
+ conversationId: string,
+ title: string,
+ ): Promise<V1AppConversation> {
+ const { data } = await openHands.patch<V1AppConversation>(
+ `/api/v1/app-conversations/${conversationId}`,
+ { title },
+ );
+ return data;
+ }
}
export default V1ConversationService;
diff --git a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
index 28a940955a..bbea07390f 100644
--- a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
+++ b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { cn } from "#/utils/utils";
-import { ConversationStatus } from "#/types/conversation-status";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
import { ConversationCardContextMenu } from "./conversation-card-context-menu";
import EllipsisIcon from "#/icons/ellipsis.svg?react";
@@ -12,7 +12,7 @@ interface ConversationCardActionsProps {
onEdit?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadViaVSCode?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadConversation?: (event: React.MouseEvent<HTMLButtonElement>) => void;
- conversationStatus?: ConversationStatus;
+ sandboxStatus?: V1SandboxStatus;
conversationId?: string;
showOptions?: boolean;
}
@@ -25,11 +25,11 @@ export function ConversationCardActions({
onEdit,
onDownloadViaVSCode,
onDownloadConversation,
- conversationStatus,
+ sandboxStatus,
conversationId,
showOptions,
}: ConversationCardActionsProps) {
- const isConversationArchived = conversationStatus === "ARCHIVED";
+ const isConversationStopped = sandboxStatus === "STOPPED";
return (
<div className="group">
@@ -43,7 +43,7 @@ export function ConversationCardActions({
}}
className={cn(
"cursor-pointer w-6 h-6 flex flex-row items-center justify-center translate-x-2.5",
- isConversationArchived && "opacity-60",
+ isConversationStopped && "opacity-60",
)}
>
<EllipsisIcon />
@@ -60,8 +60,7 @@ export function ConversationCardActions({
onClose={() => onContextMenuToggle(false)}
onDelete={onDelete}
onStop={
- conversationStatus === "RUNNING" ||
- conversationStatus === "STARTING"
+ sandboxStatus === "RUNNING" || sandboxStatus === "STARTING"
? onStop
: undefined
}
diff --git a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
index 2432751c15..8a9fa91bb8 100644
--- a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
+++ b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
@@ -3,16 +3,16 @@ import { formatTimeDelta } from "#/utils/format-time-delta";
import { cn } from "#/utils/utils";
import { I18nKey } from "#/i18n/declaration";
import { RepositorySelection } from "#/api/open-hands.types";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
import { ConversationRepoLink } from "./conversation-repo-link";
import { NoRepository } from "./no-repository";
-import { ConversationStatus } from "#/types/conversation-status";
import CircuitIcon from "#/icons/u-circuit.svg?react";
interface ConversationCardFooterProps {
selectedRepository: RepositorySelection | null;
lastUpdatedAt: string; // ISO 8601
createdAt?: string; // ISO 8601
- conversationStatus?: ConversationStatus;
+ sandboxStatus?: V1SandboxStatus;
llmModel?: string | null;
}
@@ -20,12 +20,13 @@ export function ConversationCardFooter({
selectedRepository,
lastUpdatedAt,
createdAt,
- conversationStatus,
+ sandboxStatus,
llmModel,
}: ConversationCardFooterProps) {
const { t } = useTranslation();
- const isConversationArchived = conversationStatus === "ARCHIVED";
+ const isConversationArchived =
+ sandboxStatus === "STOPPED" || sandboxStatus === "MISSING";
return (
<div
diff --git a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
index e41d9fa111..55f2d0d359 100644
--- a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
+++ b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
@@ -1,51 +1,37 @@
-import { ConversationStatus } from "#/types/conversation-status";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
import { ConversationCardTitle } from "./conversation-card-title";
-import { ConversationStatusIndicator } from "../../home/recent-conversations/conversation-status-indicator";
-import { ConversationStatusBadges } from "./conversation-status-badges";
-import { ConversationVersionBadge } from "./conversation-version-badge";
+import { SandboxStatusIndicator } from "../../home/recent-conversations/sandbox-status-indicator";
interface ConversationCardHeaderProps {
title: string;
titleMode: "view" | "edit";
onTitleSave: (title: string) => void;
- conversationStatus?: ConversationStatus;
- conversationVersion?: "V0" | "V1";
+ sandboxStatus?: V1SandboxStatus;
}
export function ConversationCardHeader({
title,
titleMode,
onTitleSave,
- conversationStatus,
- conversationVersion,
+ sandboxStatus,
}: ConversationCardHeaderProps) {
- const isConversationArchived = conversationStatus === "ARCHIVED";
+ const isConversationArchived =
+ sandboxStatus === "STOPPED" || sandboxStatus === "MISSING";
return (
<div className="flex items-center gap-2 flex-1 min-w-0 overflow-hidden mr-2">
- {/* Status Indicator */}
- {conversationStatus && (
+ {/* Status Indicator - use V1 sandbox status directly */}
+ {sandboxStatus && (
<div className="flex items-center">
- <ConversationStatusIndicator
- conversationStatus={conversationStatus}
- />
+ <SandboxStatusIndicator sandboxStatus={sandboxStatus} />
</div>
)}
- {/* Version Badge */}
- <ConversationVersionBadge
- version={conversationVersion}
- isConversationArchived={isConversationArchived}
- />
<ConversationCardTitle
title={title}
titleMode={titleMode}
onSave={onTitleSave}
isConversationArchived={isConversationArchived}
/>
- {/* Status Badges */}
- {conversationStatus && (
- <ConversationStatusBadges conversationStatus={conversationStatus} />
- )}
</div>
);
}
diff --git a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card.tsx b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
index acc3e89d1c..cbca946c47 100644
--- a/frontend/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
+++ b/frontend/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
@@ -3,11 +3,12 @@ import { usePostHog } from "posthog-js/react";
import { cn } from "#/utils/utils";
import { transformVSCodeUrl } from "#/utils/vscode-url-helper";
import ConversationService from "#/api/conversation-service/conversation-service.api";
-import { ConversationStatus } from "#/types/conversation-status";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
import { RepositorySelection } from "#/api/open-hands.types";
import { ConversationCardHeader } from "./conversation-card-header";
import { ConversationCardActions } from "./conversation-card-actions";
import { ConversationCardFooter } from "./conversation-card-footer";
+import { SandboxStatusBadges } from "./sandbox-status-badges";
import { useDownloadConversation } from "#/hooks/use-download-conversation";
interface ConversationCardProps {
@@ -20,9 +21,8 @@ interface ConversationCardProps {
selectedRepository: RepositorySelection | null;
lastUpdatedAt: string; // ISO 8601
createdAt?: string; // ISO 8601
- conversationStatus?: ConversationStatus;
+ sandboxStatus?: V1SandboxStatus;
conversationId?: string; // Optional conversation ID for VS Code URL
- conversationVersion?: "V0" | "V1";
contextMenuOpen?: boolean;
onContextMenuToggle?: (isOpen: boolean) => void;
llmModel?: string | null;
@@ -41,8 +41,7 @@ export function ConversationCard({
lastUpdatedAt,
createdAt,
conversationId,
- conversationStatus,
- conversationVersion,
+ sandboxStatus,
contextMenuOpen = false,
onContextMenuToggle,
llmModel,
@@ -111,7 +110,7 @@ export function ConversationCard({
event.preventDefault();
event.stopPropagation();
- if (conversationId && conversationVersion === "V1") {
+ if (conversationId) {
await downloadConversation(conversationId);
}
onContextMenuToggle?.(false);
@@ -130,13 +129,15 @@ export function ConversationCard({
)}
>
<div className="flex items-center justify-between w-full">
- <ConversationCardHeader
- title={title}
- titleMode={titleMode}
- onTitleSave={onTitleSave}
- conversationStatus={conversationStatus}
- conversationVersion={conversationVersion}
- />
+ <div className="flex items-center gap-2 flex-1 min-w-0">
+ <ConversationCardHeader
+ title={title}
+ titleMode={titleMode}
+ onTitleSave={onTitleSave}
+ sandboxStatus={sandboxStatus}
+ />
+ <SandboxStatusBadges sandboxStatus={sandboxStatus} />
+ </div>
{hasContextMenu && (
<ConversationCardActions
@@ -146,12 +147,8 @@ export function ConversationCard({
onStop={onStop && handleStop}
onEdit={onChangeTitle && handleEdit}
onDownloadViaVSCode={handleDownloadViaVSCode}
- onDownloadConversation={
- conversationVersion === "V1"
- ? handleDownloadConversation
- : undefined
- }
- conversationStatus={conversationStatus}
+ onDownloadConversation={handleDownloadConversation}
+ sandboxStatus={sandboxStatus}
conversationId={conversationId}
showOptions={showOptions}
/>
@@ -162,7 +159,7 @@ export function ConversationCard({
selectedRepository={selectedRepository}
lastUpdatedAt={lastUpdatedAt}
createdAt={createdAt}
- conversationStatus={conversationStatus}
+ sandboxStatus={sandboxStatus}
llmModel={llmModel}
/>
</div>
diff --git a/frontend/src/components/features/conversation-panel/conversation-card/sandbox-status-badges.tsx b/frontend/src/components/features/conversation-panel/conversation-card/sandbox-status-badges.tsx
new file mode 100644
index 0000000000..b68ed4fe0c
--- /dev/null
+++ b/frontend/src/components/features/conversation-panel/conversation-card/sandbox-status-badges.tsx
@@ -0,0 +1,26 @@
+import { FaArchive } from "react-icons/fa";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
+
+interface SandboxStatusBadgesProps {
+ sandboxStatus?: V1SandboxStatus;
+}
+
+export function SandboxStatusBadges({
+ sandboxStatus,
+}: SandboxStatusBadgesProps) {
+ const { t } = useTranslation();
+
+ // Only show badge for MISSING (archived) status
+ if (sandboxStatus !== "MISSING") {
+ return null;
+ }
+
+ return (
+ <span className="flex items-center gap-1 px-1.5 py-0.5 bg-[#868E96] text-white text-xs font-medium rounded-full opacity-60">
+ <FaArchive size={10} className="text-white" />
+ <span>{t(I18nKey.COMMON$ARCHIVED)}</span>
+ </span>
+ );
+}
diff --git a/frontend/src/components/features/conversation-panel/conversation-panel.tsx b/frontend/src/components/features/conversation-panel/conversation-panel.tsx
index 36705a2b0d..faeb2a53eb 100644
--- a/frontend/src/components/features/conversation-panel/conversation-panel.tsx
+++ b/frontend/src/components/features/conversation-panel/conversation-panel.tsx
@@ -63,8 +63,8 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
// Fetch in-progress start tasks
const { data: startTasks } = useStartTasks();
- // Flatten all pages into a single array of conversations
- const conversations = data?.pages.flatMap((page) => page.results) ?? [];
+ // Flatten all pages into a single array of conversations (V1 uses 'items' instead of 'results')
+ const conversations = data?.pages.flatMap((page) => page.items) ?? [];
const { mutate: deleteConversation } = useDeleteConversation();
const { mutate: pauseConversationSandbox } =
@@ -176,42 +176,41 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
</NavLink>
))}
{/* Then render completed conversations */}
- {conversations?.map((project) => (
+ {conversations?.map((conversation) => (
<NavLink
- key={project.conversation_id}
- to={`/conversations/${project.conversation_id}`}
+ key={conversation.id}
+ to={`/conversations/${conversation.id}`}
onClick={onClose}
>
<ConversationCard
onDelete={() =>
- handleDeleteProject(project.conversation_id, project.title)
+ handleDeleteProject(conversation.id, conversation.title ?? "")
}
onStop={() =>
handleStopConversation(
- project.conversation_id,
- project.conversation_version,
- project.sandbox_id,
+ conversation.id,
+ "V1",
+ conversation.sandbox_id,
)
}
onChangeTitle={(title) =>
- handleConversationTitleChange(project.conversation_id, title)
+ handleConversationTitleChange(conversation.id, title)
}
- title={project.title}
+ title={conversation.title ?? ""}
selectedRepository={{
- selected_repository: project.selected_repository,
- selected_branch: project.selected_branch,
- git_provider: project.git_provider as Provider,
+ selected_repository: conversation.selected_repository,
+ selected_branch: conversation.selected_branch,
+ git_provider: conversation.git_provider as Provider,
}}
- lastUpdatedAt={project.last_updated_at}
- createdAt={project.created_at}
- conversationStatus={project.status}
- conversationId={project.conversation_id}
- conversationVersion={project.conversation_version}
- contextMenuOpen={openContextMenuId === project.conversation_id}
+ lastUpdatedAt={conversation.updated_at}
+ createdAt={conversation.created_at}
+ sandboxStatus={conversation.sandbox_status}
+ conversationId={conversation.id}
+ contextMenuOpen={openContextMenuId === conversation.id}
onContextMenuToggle={(isOpen) =>
- setOpenContextMenuId(isOpen ? project.conversation_id : null)
+ setOpenContextMenuId(isOpen ? conversation.id : null)
}
- llmModel={project.llm_model}
+ llmModel={conversation.llm_model}
/>
</NavLink>
))}
diff --git a/frontend/src/components/features/home/recent-conversations/recent-conversation.tsx b/frontend/src/components/features/home/recent-conversations/recent-conversation.tsx
index ff8115d908..7f809dcbc5 100644
--- a/frontend/src/components/features/home/recent-conversations/recent-conversation.tsx
+++ b/frontend/src/components/features/home/recent-conversations/recent-conversation.tsx
@@ -1,17 +1,17 @@
import { useTranslation } from "react-i18next";
import { Link } from "react-router";
import CodeBranchIcon from "#/icons/u-code-branch.svg?react";
-import { Conversation } from "#/api/open-hands.types";
+import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
import { GitProviderIcon } from "#/components/shared/git-provider-icon";
import { Provider } from "#/types/settings";
import { formatTimeDelta } from "#/utils/format-time-delta";
import { I18nKey } from "#/i18n/declaration";
-import { ConversationStatusIndicator } from "./conversation-status-indicator";
+import { SandboxStatusIndicator } from "./sandbox-status-indicator";
import RepoForkedIcon from "#/icons/repo-forked.svg?react";
import CircuitIcon from "#/icons/u-circuit.svg?react";
interface RecentConversationProps {
- conversation: Conversation;
+ conversation: V1AppConversation;
}
export function RecentConversation({ conversation }: RecentConversationProps) {
@@ -22,11 +22,11 @@ export function RecentConversation({ conversation }: RecentConversationProps) {
return (
<Link
- to={`/conversations/${conversation.conversation_id}`}
+ to={`/conversations/${conversation.id}`}
className="flex flex-col gap-1 p-[14px] cursor-pointer w-full rounded-lg hover:bg-[#5C5D62] transition-all duration-300 text-left"
>
<div className="flex items-center gap-2 pl-1">
- <ConversationStatusIndicator conversationStatus={conversation.status} />
+ <SandboxStatusIndicator sandboxStatus={conversation.sandbox_status} />
<span className="text-xs text-white leading-6 font-normal">
{conversation.title}
</span>
@@ -76,10 +76,10 @@ export function RecentConversation({ conversation }: RecentConversationProps) {
<span className="truncate">{conversation.llm_model}</span>
</span>
)}
- {(conversation.created_at || conversation.last_updated_at) && (
+ {(conversation.created_at || conversation.updated_at) && (
<span>
{formatTimeDelta(
- conversation.created_at || conversation.last_updated_at,
+ conversation.created_at || conversation.updated_at,
)}{" "}
{t(I18nKey.CONVERSATION$AGO)}
</span>
diff --git a/frontend/src/components/features/home/recent-conversations/recent-conversations.tsx b/frontend/src/components/features/home/recent-conversations/recent-conversations.tsx
index d0bd560c7d..2b862cf5cb 100644
--- a/frontend/src/components/features/home/recent-conversations/recent-conversations.tsx
+++ b/frontend/src/components/features/home/recent-conversations/recent-conversations.tsx
@@ -29,7 +29,7 @@ export function RecentConversations() {
});
const conversations =
- conversationsList?.pages.flatMap((page) => page.results) ?? [];
+ conversationsList?.pages.flatMap((page) => page.items) ?? [];
// Get the conversations to display based on expansion state
const displayLimit = isExpanded ? 10 : 3;
@@ -92,7 +92,7 @@ export function RecentConversations() {
<div ref={scrollContainerRef} className="flex flex-col">
{displayedConversations.map((conversation) => (
<RecentConversation
- key={conversation.conversation_id}
+ key={conversation.id}
conversation={conversation}
/>
))}
diff --git a/frontend/src/components/features/home/recent-conversations/sandbox-status-indicator.tsx b/frontend/src/components/features/home/recent-conversations/sandbox-status-indicator.tsx
new file mode 100644
index 0000000000..ba7a35d33e
--- /dev/null
+++ b/frontend/src/components/features/home/recent-conversations/sandbox-status-indicator.tsx
@@ -0,0 +1,65 @@
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
+import { cn } from "#/utils/utils";
+import { StyledTooltip } from "#/components/shared/buttons/styled-tooltip";
+
+interface SandboxStatusIndicatorProps {
+ sandboxStatus: V1SandboxStatus;
+}
+
+// Map V1SandboxStatus to translation keys
+const getSandboxStatusLabel = (status: V1SandboxStatus): string => {
+ switch (status) {
+ case "RUNNING":
+ return "COMMON$RUNNING";
+ case "STARTING":
+ return "COMMON$STARTING";
+ case "STOPPED":
+ return "COMMON$STOPPED";
+ case "PAUSED":
+ return "COMMON$PAUSED";
+ case "MISSING":
+ return "COMMON$ARCHIVED";
+ default:
+ return "COMMON$STOPPED";
+ }
+};
+
+export function SandboxStatusIndicator({
+ sandboxStatus,
+}: SandboxStatusIndicatorProps) {
+ const { t } = useTranslation();
+
+ const sandboxStatusBackgroundColor = useMemo(() => {
+ switch (sandboxStatus) {
+ case "RUNNING":
+ return "bg-[#1FBD53]"; // Running/online - green
+ case "STARTING":
+ return "bg-[#FFD43B]"; // Busy/starting - yellow
+ case "PAUSED":
+ return "bg-[#A3A3A3]"; // Paused - grey
+ case "STOPPED":
+ return "bg-[#3C3C49]"; // Stopped - dark grey
+ case "MISSING":
+ return "bg-[#A3A3A3]"; // Missing - grey (archived)
+ default:
+ return "bg-[#3C3C49]"; // Default to grey for unknown states
+ }
+ }, [sandboxStatus]);
+
+ const statusLabel = t(getSandboxStatusLabel(sandboxStatus));
+
+ return (
+ <StyledTooltip
+ content={statusLabel}
+ placement="right"
+ showArrow
+ tooltipClassName="bg-[#1a1a1a] text-white text-xs shadow-lg"
+ >
+ <div
+ className={cn("w-1.5 h-1.5 rounded-full", sandboxStatusBackgroundColor)}
+ />
+ </StyledTooltip>
+ );
+}
diff --git a/frontend/src/hooks/mutation/conversation-mutation-utils.ts b/frontend/src/hooks/mutation/conversation-mutation-utils.ts
index 70b570e32d..f2c1a6fab4 100644
--- a/frontend/src/hooks/mutation/conversation-mutation-utils.ts
+++ b/frontend/src/hooks/mutation/conversation-mutation-utils.ts
@@ -103,16 +103,22 @@ export const startV0Conversation = async (
/**
* Optimistically updates the conversation status in the cache
*/
-export const updateConversationStatusInCache = (
+export const updateConversationSandboxStatusInCache = (
queryClient: QueryClient,
conversationId: string,
- status: string,
+ sandbox_status: string,
): void => {
// Update the individual conversation cache
queryClient.setQueryData<{ status: string }>(
["user", "conversation", conversationId],
(oldData) => {
if (!oldData) return oldData;
+ let status = sandbox_status;
+ if (status === "PAUSED") {
+ status = "STOPPED";
+ } else if (status === "MISSING") {
+ status = "ARCHIVED";
+ }
return { ...oldData, status };
},
);
@@ -120,7 +126,7 @@ export const updateConversationStatusInCache = (
// Update the conversations list cache
queryClient.setQueriesData<{
pages: Array<{
- results: Array<{ conversation_id: string; status: string }>;
+ items: Array<{ id: string; sandbox_status: string }>;
}>;
}>({ queryKey: ["user", "conversations"] }, (oldData) => {
if (!oldData) return oldData;
@@ -129,8 +135,8 @@ export const updateConversationStatusInCache = (
...oldData,
pages: oldData.pages.map((page) => ({
...page,
- results: page.results.map((conv) =>
- conv.conversation_id === conversationId ? { ...conv, status } : conv,
+ items: page.items.map((conv) =>
+ conv.id === conversationId ? { ...conv, sandbox_status } : conv,
),
})),
};
diff --git a/frontend/src/hooks/mutation/use-unified-start-conversation.ts b/frontend/src/hooks/mutation/use-unified-start-conversation.ts
index fafa0f98dd..83c9a12dd0 100644
--- a/frontend/src/hooks/mutation/use-unified-start-conversation.ts
+++ b/frontend/src/hooks/mutation/use-unified-start-conversation.ts
@@ -5,7 +5,7 @@ import {
getConversationVersionFromQueryCache,
resumeV1ConversationSandbox,
startV0Conversation,
- updateConversationStatusInCache,
+ updateConversationSandboxStatusInCache,
invalidateConversationQueries,
} from "./conversation-mutation-utils";
@@ -85,10 +85,10 @@ export const useUnifiedResumeConversationSandbox = () => {
// Clear error messages when starting/resuming conversation
removeErrorMessage();
- updateConversationStatusInCache(
+ updateConversationSandboxStatusInCache(
queryClient,
variables.conversationId,
- "RUNNING",
+ "STARTING",
);
},
});
diff --git a/frontend/src/hooks/mutation/use-unified-stop-conversation.ts b/frontend/src/hooks/mutation/use-unified-stop-conversation.ts
index 4ef0d61fa1..4ff195cf5a 100644
--- a/frontend/src/hooks/mutation/use-unified-stop-conversation.ts
+++ b/frontend/src/hooks/mutation/use-unified-stop-conversation.ts
@@ -8,7 +8,7 @@ import {
getConversationVersionFromQueryCache,
pauseV1ConversationSandbox,
stopV0Conversation,
- updateConversationStatusInCache,
+ updateConversationSandboxStatusInCache,
} from "./conversation-mutation-utils";
/**
@@ -81,10 +81,10 @@ export const useUnifiedPauseConversationSandbox = () => {
}
toast.success(t(I18nKey.TOAST$CONVERSATION_STOPPED), TOAST_OPTIONS);
- updateConversationStatusInCache(
+ updateConversationSandboxStatusInCache(
queryClient,
variables.conversationId,
- "STOPPED",
+ "PAUSED",
);
// Only redirect if we're stopping the conversation we're currently viewing
diff --git a/frontend/src/hooks/mutation/use-update-conversation.ts b/frontend/src/hooks/mutation/use-update-conversation.ts
index 8b6cedc311..8793951320 100644
--- a/frontend/src/hooks/mutation/use-update-conversation.ts
+++ b/frontend/src/hooks/mutation/use-update-conversation.ts
@@ -1,14 +1,15 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import ConversationService from "#/api/conversation-service/conversation-service.api";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
export const useUpdateConversation = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (variables: { conversationId: string; newTitle: string }) =>
- ConversationService.updateConversation(variables.conversationId, {
- title: variables.newTitle,
- }),
+ V1ConversationService.updateConversationTitle(
+ variables.conversationId,
+ variables.newTitle,
+ ),
onMutate: async (variables) => {
await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
const previousConversations = queryClient.getQueryData([
@@ -18,9 +19,9 @@ export const useUpdateConversation = () => {
queryClient.setQueryData(
["user", "conversations"],
- (old: { conversation_id: string; title: string }[] | undefined) =>
+ (old: { id: string; title: string }[] | undefined) =>
old?.map((conv) =>
- conv.conversation_id === variables.conversationId
+ conv.id === variables.conversationId
? { ...conv, title: variables.newTitle }
: conv,
),
diff --git a/frontend/src/hooks/query/use-paginated-conversations.ts b/frontend/src/hooks/query/use-paginated-conversations.ts
index 67218606aa..26c59b5161 100644
--- a/frontend/src/hooks/query/use-paginated-conversations.ts
+++ b/frontend/src/hooks/query/use-paginated-conversations.ts
@@ -1,6 +1,7 @@
import { useInfiniteQuery } from "@tanstack/react-query";
-import ConversationService from "#/api/conversation-service/conversation-service.api";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
import { useIsAuthed } from "./use-is-authed";
+import { V1AppConversationPage } from "#/api/conversation-service/v1-conversation-service.types";
export const usePaginatedConversations = (limit: number = 20) => {
const { data: userIsAuthenticated } = useIsAuthed();
@@ -8,7 +9,7 @@ export const usePaginatedConversations = (limit: number = 20) => {
return useInfiniteQuery({
queryKey: ["user", "conversations", "paginated", limit],
queryFn: async ({ pageParam }) => {
- const result = await ConversationService.getUserConversations(
+ const result = await V1ConversationService.searchConversations(
limit,
pageParam,
);
@@ -16,7 +17,8 @@ export const usePaginatedConversations = (limit: number = 20) => {
return result;
},
enabled: !!userIsAuthenticated,
- getNextPageParam: (lastPage) => lastPage.next_page_id,
+ getNextPageParam: (lastPage: V1AppConversationPage) =>
+ lastPage.next_page_id,
initialPageParam: undefined as string | undefined,
});
};
diff --git a/frontend/src/types/conversation-status.ts b/frontend/src/types/conversation-status.ts
index a9d77217dd..0d1b9f80e2 100644
--- a/frontend/src/types/conversation-status.ts
+++ b/frontend/src/types/conversation-status.ts
@@ -2,5 +2,8 @@ export type ConversationStatus =
| "STARTING"
| "RUNNING"
| "STOPPED"
+ | "PAUSED"
+ | "AWAITING_USER_INPUT"
+ | "FINISHED"
| "ARCHIVED"
| "ERROR";