π OpenHands: AI-Driven Development
fix: show non-resumable local conversations as archived (#17500)
Graham Neubigef7bdb1e64fa
diff --git a/__tests__/api/agent-server-adapter.test.ts b/__tests__/api/agent-server-adapter.test.tsindex f55c7047df..10d6825a57 100644--- a/__tests__/api/agent-server-adapter.test.ts+++ b/__tests__/api/agent-server-adapter.test.ts@@ -997,6 +997,30 @@ describe("toAppConversation", () => {updated_at: "2026-01-01T00:00:00Z",};+ it("uses the archived status for a missing runtime that cannot resume", () => {+ const result = toAppConversation({+ ...baseInfo,+ runtime_info: {+ runtime_status: "missing",+ can_resume: false,+ },+ });++ expect(result.sandbox_status).toBe("MISSING");+ });++ it("does not archive a missing runtime that can resume", () => {+ const result = toAppConversation({+ ...baseInfo,+ runtime_info: {+ runtime_status: "missing",+ can_resume: true,+ },+ });++ expect(result.sandbox_status).toBeNull();+ });+it("combines stats.usage_to_metrics into metrics when the backend doesn't set metrics directly (#16480)", () => {const result = toAppConversation({...baseInfo,diff --git a/__tests__/api/agent-server-conversation-service.test.ts b/__tests__/api/agent-server-conversation-service.test.tsindex 04f817451f..d8271f4993 100644--- a/__tests__/api/agent-server-conversation-service.test.ts+++ b/__tests__/api/agent-server-conversation-service.test.ts@@ -888,6 +888,30 @@ describe("AgentServerConversationService", () => {expect(conversation?.sandbox_status).toBeNull();});+ it("archives a local conversation whose runtime cannot resume", async () => {+ mockHttpGet.mockResolvedValue({+ data: [+ {+ id: "legacy-local-conversation",+ created_at: "2024-01-01",+ updated_at: "2024-01-01",+ runtime_info: {+ runtime_status: "missing",+ can_resume: false,+ runtime_error: null,+ },+ },+ ],+ });++ const [conversation] =+ await AgentServerConversationService.batchGetAppConversations([+ "legacy-local-conversation",+ ]);++ expect(conversation?.sandbox_status).toBe("MISSING");+ });+it("sanitizes malformed optional conversation fields", async () => {mockHttpGet.mockResolvedValue({data: [diff --git a/__tests__/contexts/websocket-provider-wrapper.test.tsx b/__tests__/contexts/websocket-provider-wrapper.test.tsxindex 9baf4b61e8..f4dc5d830b 100644--- a/__tests__/contexts/websocket-provider-wrapper.test.tsx+++ b/__tests__/contexts/websocket-provider-wrapper.test.tsx@@ -136,6 +136,19 @@ describe("WebSocketProviderWrapper β conversationUrl gating", () => {expect(capturedUrlPerRender.at(-1)).toBeNull();});+ it.each(["MISSING", "ERROR"] as const)(+ "suppresses conversation_url when sandbox_status is %s",+ (sandboxStatus) => {+ mockUseActiveConversation.mockReturnValue({+ data: makeConversation({ sandbox_status: sandboxStatus }),+ });++ renderWrapper();++ expect(capturedUrlPerRender.at(-1)).toBeNull();+ },+ );+it("passes null through when conversation data has no url (sandbox still starting)", () => {mockUseActiveConversation.mockReturnValue({data: makeConversation({ sandbox_status: null, conversation_url: null }),diff --git a/src/api/agent-server-adapter.ts b/src/api/agent-server-adapter.tsindex 54558aa52e..559e669487 100644--- a/src/api/agent-server-adapter.ts+++ b/src/api/agent-server-adapter.ts@@ -1,5 +1,8 @@import { ACP_SETTINGS_KEYS } from "@openhands/typescript-client";-import type { HookConfig } from "@openhands/typescript-client";+import type {+ ConversationRuntimeInfo,+ HookConfig,+} from "@openhands/typescript-client";import { ServerClient } from "@openhands/typescript-client/clients";import { SKILLS_CATALOG } from "@openhands/extensions/skills";import { DEFAULT_SETTINGS } from "#/services/settings";@@ -68,6 +71,11 @@ export interface DirectConversationInfo {execution_status?: string | null;/** Cloud-only sandbox lifecycle state. Omitted / null for local agent-server conversations. */sandbox_status?: string | null;+ /** Availability of the runtime that backs a local conversation. */+ runtime_info?: Pick<+ ConversationRuntimeInfo,+ "runtime_status" | "can_resume"+ > | null;metrics?: {accumulated_cost?: number | null;max_budget_per_task?: number | null;@@ -419,7 +427,11 @@ export function toAppConversation(execution_status:(info.execution_status as AppConversation["execution_status"]) ??ExecutionStatus.IDLE,- sandbox_status: (info.sandbox_status as SandboxStatus | null) ?? null,+ sandbox_status:+ info.runtime_info?.runtime_status === "missing" &&+ !info.runtime_info.can_resume+ ? "MISSING"+ : ((info.sandbox_status as SandboxStatus | null) ?? null),conversation_url: toConversationUrl(info.id),session_api_key: getAgentServerClientOptions().apiKey ?? null,sandbox_id: null,diff --git a/src/api/conversation-service/agent-server-conversation-service.api.ts b/src/api/conversation-service/agent-server-conversation-service.api.tsindex 61f34b562a..736f9dfbd3 100644--- a/src/api/conversation-service/agent-server-conversation-service.api.ts+++ b/src/api/conversation-service/agent-server-conversation-service.api.ts@@ -153,6 +153,27 @@ function normalizeStats(value: unknown): RuntimeConversationStats | null {: null;}+function normalizeRuntimeInfo(+ value: unknown,+): DirectConversationInfo["runtime_info"] {+ if (!isRecord(value)) return null;+ const runtimeStatus = value.runtime_status;+ if (+ runtimeStatus !== "available" &&+ runtimeStatus !== "starting" &&+ runtimeStatus !== "missing" &&+ runtimeStatus !== "ownership_lost" &&+ runtimeStatus !== "error"+ ) {+ return null;+ }++ return {+ runtime_status: runtimeStatus,+ can_resume: value.can_resume === true,+ };+}+function normalizeAgent(value: unknown): DirectConversationInfo["agent"] {if (!isRecord(value)) return null;const llm = isRecord(value.llm)@@ -274,6 +295,7 @@ function requireDirectConversationInfo(item: unknown): DirectConversationInfo {updated_at: readTimestamp(item, "updated_at", "updatedAt"),execution_status: stringOrNull(item.execution_status),sandbox_status: stringOrNull(item.sandbox_status),+ runtime_info: normalizeRuntimeInfo(item.runtime_info),metrics: normalizeMetrics(item.metrics),stats: normalizeStats(item.stats),agent: normalizeAgent(item.agent),diff --git a/src/contexts/websocket-provider-wrapper.tsx b/src/contexts/websocket-provider-wrapper.tsxindex 680371a967..0cdd49e098 100644--- a/src/contexts/websocket-provider-wrapper.tsx+++ b/src/contexts/websocket-provider-wrapper.tsx@@ -6,6 +6,7 @@ import type { AppConversation } from "#/api/conversation-service/agent-server-coimport { useConversationStore } from "#/stores/conversation-store";import { useActiveBackend } from "#/contexts/active-backend-context";import { findPlannerConversationId } from "#/utils/plan-file";+import { isArchivedSandboxStatus } from "#/utils/conversation-archive-status";interface WebSocketProviderWrapperProps {children: React.ReactNode;@@ -93,10 +94,11 @@ export function WebSocketProviderWrapper({planningConversationIds.includes(subConversation.id),);- // Suppress the URL while the cloud sandbox is PAUSED β it still points at- // the old (now-rejecting) host until the sandbox resumes.+ // A paused or archived runtime cannot accept a WebSocket connection. Its+ // persisted event history remains available through the backend API.const conversationUrl =- conversation?.sandbox_status === "PAUSED"+ conversation?.sandbox_status === "PAUSED" ||+ isArchivedSandboxStatus(conversation?.sandbox_status)? null: conversation?.conversation_url;