Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Fix V1 resumed conversation status sync (#13989)

Ash Clarke97343ebe9aaf
diff --git a/frontend/src/components/features/controls/agent-status.tsx b/frontend/src/components/features/controls/agent-status.tsx
index fe236150b6..b0dba1fa25 100644
--- a/frontend/src/components/features/controls/agent-status.tsx
+++ b/frontend/src/components/features/controls/agent-status.tsx
@@ -32,7 +32,7 @@ export function AgentStatus({
}: AgentStatusProps) {
const { t } = useTranslation();
const { setShouldShownAgentLoading } = useConversationStore();
- const { curAgentState } = useAgentState();
+ const { curAgentState, executionStatus } = useAgentState();
const webSocketStatus = useUnifiedWebSocketStatus();
const { data: conversation } = useActiveConversation();
const { taskStatus } = useTaskPolling();
@@ -48,7 +48,7 @@ export function AgentStatus({
const statusCode = getStatusCode(
webSocketStatus,
- conversation?.execution_status || null,
+ executionStatus ?? null,
conversation?.sandbox_status || null,
taskStatus,
subConversationTaskStatus,
diff --git a/frontend/src/hooks/mutation/conversation-mutation-utils.test.ts b/frontend/src/hooks/mutation/conversation-mutation-utils.test.ts
new file mode 100644
index 0000000000..5786f64cbd
--- /dev/null
+++ b/frontend/src/hooks/mutation/conversation-mutation-utils.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from "vitest";
+import { QueryClient } from "@tanstack/react-query";
+import { updateConversationSandboxStatusInCache } from "./conversation-mutation-utils";
+import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+
+const createConversation = (): V1AppConversation => ({
+ id: "conversation-1",
+ created_by_user_id: null,
+ sandbox_id: "sandbox-1",
+ selected_repository: null,
+ selected_branch: null,
+ git_provider: null,
+ title: "Test conversation",
+ trigger: null,
+ pr_number: [],
+ llm_model: null,
+ metrics: null,
+ created_at: "2026-04-16T00:00:00Z",
+ updated_at: "2026-04-16T00:00:00Z",
+ sandbox_status: "RUNNING",
+ execution_status: V1ExecutionStatus.FINISHED,
+ conversation_url: "http://localhost:3000/api/conversations/conversation-1",
+ session_api_key: "session-key",
+ sub_conversation_ids: [],
+});
+
+describe("updateConversationSandboxStatusInCache", () => {
+ it("updates the active conversation sandbox_status field", () => {
+ const queryClient = new QueryClient();
+ const conversation = createConversation();
+
+ queryClient.setQueryData(
+ ["user", "conversation", conversation.id],
+ conversation,
+ );
+
+ updateConversationSandboxStatusInCache(
+ queryClient,
+ conversation.id,
+ "PAUSED",
+ );
+
+ expect(
+ queryClient.getQueryData<V1AppConversation | null>([
+ "user",
+ "conversation",
+ conversation.id,
+ ]),
+ ).toMatchObject({
+ sandbox_status: "PAUSED",
+ execution_status: null,
+ });
+ });
+
+ it("does not create a legacy status field on the active conversation cache", () => {
+ const queryClient = new QueryClient();
+ const conversation = createConversation();
+
+ queryClient.setQueryData(
+ ["user", "conversation", conversation.id],
+ conversation,
+ );
+
+ updateConversationSandboxStatusInCache(
+ queryClient,
+ conversation.id,
+ "STARTING",
+ );
+
+ const cachedConversation = queryClient.getQueryData<
+ V1AppConversation & { status?: string }
+ >(["user", "conversation", conversation.id]);
+
+ expect(cachedConversation?.status).toBeUndefined();
+ expect(cachedConversation?.sandbox_status).toBe("STARTING");
+ });
+});
diff --git a/frontend/src/hooks/mutation/conversation-mutation-utils.ts b/frontend/src/hooks/mutation/conversation-mutation-utils.ts
index c4bd80d3ae..47d19271b3 100644
--- a/frontend/src/hooks/mutation/conversation-mutation-utils.ts
+++ b/frontend/src/hooks/mutation/conversation-mutation-utils.ts
@@ -1,6 +1,8 @@
import { QueryClient } from "@tanstack/react-query";
import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
import { SandboxService } from "#/api/sandbox-service/sandbox-service.api";
+import { V1SandboxStatus } from "#/api/sandbox-service/sandbox-service.types";
/**
* Fetches a V1 conversation's sandbox_id and conversation_url
@@ -93,20 +95,20 @@ export const resumeV1Conversation = async (conversationId: string) => {
export const updateConversationSandboxStatusInCache = (
queryClient: QueryClient,
conversationId: string,
- sandbox_status: string,
+ sandbox_status: V1SandboxStatus,
): void => {
// Update the individual conversation cache
- queryClient.setQueryData<{ status: string }>(
+ queryClient.setQueryData<V1AppConversation | null>(
["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 };
+
+ return {
+ ...oldData,
+ sandbox_status,
+ execution_status:
+ sandbox_status === "RUNNING" ? oldData.execution_status : null,
+ };
},
);
diff --git a/frontend/src/hooks/use-agent-state.test.tsx b/frontend/src/hooks/use-agent-state.test.tsx
new file mode 100644
index 0000000000..056d1742a8
--- /dev/null
+++ b/frontend/src/hooks/use-agent-state.test.tsx
@@ -0,0 +1,61 @@
+import { act, renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useAgentState } from "./use-agent-state";
+import { useActiveConversation } from "./query/use-active-conversation";
+import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
+import { AgentState } from "#/types/agent-state";
+import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+
+vi.mock("./query/use-active-conversation", () => ({
+ useActiveConversation: vi.fn(),
+}));
+
+describe("useAgentState", () => {
+ const mockUseActiveConversation = vi.mocked(useActiveConversation);
+
+ beforeEach(() => {
+ act(() => {
+ useV1ConversationStateStore.getState().reset();
+ });
+
+ mockUseActiveConversation.mockReturnValue({
+ data: null,
+ } as ReturnType<typeof useActiveConversation>);
+ });
+
+ it("prefers live websocket execution status over cached conversation status", () => {
+ mockUseActiveConversation.mockReturnValue({
+ data: {
+ execution_status: V1ExecutionStatus.FINISHED,
+ },
+ } as ReturnType<typeof useActiveConversation>);
+
+ act(() => {
+ useV1ConversationStateStore
+ .getState()
+ .setExecutionStatus(V1ExecutionStatus.RUNNING);
+ });
+
+ const { result } = renderHook(() => useAgentState());
+
+ expect(result.current.executionStatus).toBe(V1ExecutionStatus.RUNNING);
+ expect(result.current.curAgentState).toBe(AgentState.RUNNING);
+ });
+
+ it("falls back to cached conversation execution status when live state is empty", () => {
+ mockUseActiveConversation.mockReturnValue({
+ data: {
+ execution_status: V1ExecutionStatus.WAITING_FOR_CONFIRMATION,
+ },
+ } as ReturnType<typeof useActiveConversation>);
+
+ const { result } = renderHook(() => useAgentState());
+
+ expect(result.current.executionStatus).toBe(
+ V1ExecutionStatus.WAITING_FOR_CONFIRMATION,
+ );
+ expect(result.current.curAgentState).toBe(
+ AgentState.AWAITING_USER_CONFIRMATION,
+ );
+ });
+});
diff --git a/frontend/src/hooks/use-agent-state.ts b/frontend/src/hooks/use-agent-state.ts
index f2cf5a09bd..d29695ed50 100644
--- a/frontend/src/hooks/use-agent-state.ts
+++ b/frontend/src/hooks/use-agent-state.ts
@@ -1,4 +1,5 @@
import { useMemo } from "react";
+import { useActiveConversation } from "#/hooks/query/use-active-conversation";
import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
import { AgentState } from "#/types/agent-state";
import { V1ExecutionStatus } from "#/types/v1/core/base/common";
@@ -31,20 +32,28 @@ function mapV1StatusToV0State(status: V1ExecutionStatus | null): AgentState {
}
}
+export interface UseAgentStateResult {
+ curAgentState: AgentState;
+ executionStatus?: V1ExecutionStatus | null;
+}
+
/**
* Unified hook that returns the current agent state
* - For V0 conversations: Returns state from useAgentStore
* - For V1 conversations: Returns mapped state from useV1ConversationStateStore
*/
-export function useAgentState() {
- const v1Status = useV1ConversationStateStore(
+export function useAgentState(): UseAgentStateResult {
+ const liveExecutionStatus = useV1ConversationStateStore(
(state) => state.execution_status,
);
+ const fallbackExecutionStatus =
+ useActiveConversation().data?.execution_status ?? null;
+ const executionStatus = liveExecutionStatus ?? fallbackExecutionStatus;
const curAgentState = useMemo(
- () => mapV1StatusToV0State(v1Status),
- [v1Status],
+ () => mapV1StatusToV0State(executionStatus),
+ [executionStatus],
);
- return { curAgentState };
+ return { curAgentState, executionStatus };
}
diff --git a/frontend/src/routes/conversation.tsx b/frontend/src/routes/conversation.tsx
index fba9cd87aa..27fbdff054 100644
--- a/frontend/src/routes/conversation.tsx
+++ b/frontend/src/routes/conversation.tsx
@@ -6,6 +6,7 @@ import { useConversationId } from "#/hooks/use-conversation-id";
import { useCommandStore } from "#/stores/command-store";
import { useConversationStore } from "#/stores/conversation-store";
import { useAgentStore } from "#/stores/agent-store";
+import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
import { AgentState } from "#/types/agent-state";
import { EventHandler } from "../wrapper/event-handler";
@@ -39,6 +40,9 @@ function AppContent() {
const { resetConversationState } = useConversationStore();
const navigate = useNavigate();
const clearTerminal = useCommandStore((state) => state.clearTerminal);
+ const resetV1ConversationState = useV1ConversationStateStore(
+ (state) => state.reset,
+ );
const setCurrentAgentState = useAgentStore(
(state) => state.setCurrentAgentState,
);
@@ -50,6 +54,7 @@ function AppContent() {
React.useEffect(() => {
clearTerminal();
resetConversationState();
+ resetV1ConversationState();
setCurrentAgentState(AgentState.LOADING);
removeErrorMessage();
clearEvents();
@@ -57,6 +62,7 @@ function AppContent() {
conversationId,
clearTerminal,
resetConversationState,
+ resetV1ConversationState,
setCurrentAgentState,
removeErrorMessage,
clearEvents,