π OpenHands: AI-Driven Development
fix(msw): use wildcard URL patterns to match absolute URLs (#344)
Rohit Malhotra05deacbd3575
diff --git a/__tests__/api/option-service.test.ts b/__tests__/api/option-service.test.tsindex 4cd3dbb556..0a9e604594 100644--- a/__tests__/api/option-service.test.ts+++ b/__tests__/api/option-service.test.ts@@ -23,7 +23,7 @@ describe("OptionService", () => {it("loads config regardless of agent server version", async () => {server.use(- http.get("/server_info", () =>+ http.get("*/server_info", () =>HttpResponse.json({ uptime: 0, idle_time: 0, version: "1.0.0" }),),);@@ -35,7 +35,7 @@ describe("OptionService", () => {it("loads config even when the server does not advertise a version", async () => {server.use(- http.get("/server_info", () =>+ http.get("*/server_info", () =>HttpResponse.json({ uptime: 0, idle_time: 0 }),),);@@ -46,7 +46,7 @@ describe("OptionService", () => {});it("throws an unavailable error when the agent server cannot be reached", async () => {- server.use(http.get("/server_info", () => HttpResponse.error()));+ server.use(http.get("*/server_info", () => HttpResponse.error()));await expect(OptionService.getConfig()).rejects.toMatchObject({name: AgentServerUnavailableError.name,@@ -57,7 +57,7 @@ describe("OptionService", () => {it("caches usable_tools from server_info for later tool gating", async () => {server.use(- http.get("/server_info", () =>+ http.get("*/server_info", () =>HttpResponse.json({uptime: 0,idle_time: 0,@@ -75,7 +75,7 @@ describe("OptionService", () => {it("allows all tools when the server does not advertise tool metadata", async () => {server.use(- http.get("/server_info", () =>+ http.get("*/server_info", () =>HttpResponse.json({uptime: 0,idle_time: 0,diff --git a/__tests__/api/settings-service.test.ts b/__tests__/api/settings-service.test.tsindex 5d676667cb..5521b3c4ad 100644--- a/__tests__/api/settings-service.test.ts+++ b/__tests__/api/settings-service.test.ts@@ -207,9 +207,11 @@ describe("SettingsService", () => {it("excludes app-level fields from the local PATCH body when mixed with diffs", async () => {// Arrange: capture the PATCH body the local agent-server would receive.// The handler must echo a valid response so saveSettings does not throw.+ // Use "*" prefix to match both relative paths and absolute URLs (e.g.,+ // http://127.0.0.1:8000/api/...) when VITE_BACKEND_BASE_URL is configured.const patchBodies: Array<Record<string, unknown>> = [];server.use(- http.patch("/api/settings", async ({ request }) => {+ http.patch("*/api/settings", async ({ request }) => {patchBodies.push((await request.json()) as Record<string, unknown>);return HttpResponse.json({agent_settings: {},diff --git a/__tests__/components/modals/settings/model-selector-openhands.test.tsx b/__tests__/components/modals/settings/model-selector-openhands.test.tsxindex 933440a248..6d8a4cf427 100644--- a/__tests__/components/modals/settings/model-selector-openhands.test.tsx+++ b/__tests__/components/modals/settings/model-selector-openhands.test.tsx@@ -15,12 +15,14 @@ describe("ModelSelector β OpenHands round-trip", () => {providersCount = 0;verifiedCount = 0;modelsCount = 0;+ // Use "*" prefix to match both relative paths and absolute URLs (e.g.,+ // http://127.0.0.1:8000/api/...) when VITE_BACKEND_BASE_URL is configured.server.use(- http.get("/api/llm/providers", () => {+ http.get("*/api/llm/providers", () => {providersCount += 1;return HttpResponse.json({ providers: ["anthropic", "openai"] });}),- http.get("/api/llm/models/verified", () => {+ http.get("*/api/llm/models/verified", () => {verifiedCount += 1;return HttpResponse.json({models: {@@ -29,7 +31,7 @@ describe("ModelSelector β OpenHands round-trip", () => {},});}),- http.get("/api/llm/models", () => {+ http.get("*/api/llm/models", () => {modelsCount += 1;return HttpResponse.json({ models: [] });}),diff --git a/__tests__/root.test.tsx b/__tests__/root.test.tsxindex 5b7b276062..49da269457 100644--- a/__tests__/root.test.tsx+++ b/__tests__/root.test.tsx@@ -101,8 +101,10 @@ describe("App root agent-server availability guard", () => {it("shows the manage-backends modal when the backend is unreachable", async () => {let serverInfoRequests = 0;+ // Use "*" prefix to match both relative paths and absolute URLs (e.g.,+ // http://127.0.0.1:8000/server_info) when VITE_BACKEND_BASE_URL is configured.server.use(- http.get("/server_info", () => {+ http.get("*/server_info", () => {serverInfoRequests += 1;return HttpResponse.error();}),diff --git a/src/mocks/api-keys-handlers.ts b/src/mocks/api-keys-handlers.tsindex 339eee26de..2227ea9166 100644--- a/src/mocks/api-keys-handlers.ts+++ b/src/mocks/api-keys-handlers.ts@@ -26,10 +26,10 @@ const apiKeys = new Map<string, ApiKey>(export const API_KEYS_HANDLERS = [// GET /api/keys - List all API keys- http.get("/api/keys", () => HttpResponse.json(Array.from(apiKeys.values()))),+ http.get("*/api/keys", () => HttpResponse.json(Array.from(apiKeys.values()))),// POST /api/keys - Create a new API key- http.post("/api/keys", async ({ request }) => {+ http.post("*/api/keys", async ({ request }) => {const body = (await request.json()) as { name: string };if (!body?.name?.trim()) {@@ -59,7 +59,7 @@ export const API_KEYS_HANDLERS = [}),// DELETE /api/keys/:id - Delete an API key- http.delete("/api/keys/:id", ({ params }) => {+ http.delete("*/api/keys/:id", ({ params }) => {const { id } = params;if (typeof id === "string" && apiKeys.has(id)) {@@ -71,14 +71,14 @@ export const API_KEYS_HANDLERS = [}),// GET /api/keys/llm/byor - Get LLM API key- http.get("/api/keys/llm/byor", () =>+ http.get("*/api/keys/llm/byor", () =>HttpResponse.json({key: "sk-mock-llm-api-key-1234567890abcdef",}),),// POST /api/keys/llm/byor/refresh - Refresh LLM API key- http.post("/api/keys/llm/byor/refresh", () =>+ http.post("*/api/keys/llm/byor/refresh", () =>HttpResponse.json({key: `sk-mock-llm-refreshed-${Math.random().toString(36).slice(2, 14)}`,}),diff --git a/src/mocks/auth-handlers.ts b/src/mocks/auth-handlers.tsindex bb4baf2397..39f309c8e2 100644--- a/src/mocks/auth-handlers.ts+++ b/src/mocks/auth-handlers.ts@@ -2,7 +2,7 @@ import { http, HttpResponse } from "msw";import { GitUser } from "#/types/git";export const AUTH_HANDLERS = [- http.get("/api/user/info", () => {+ http.get("*/api/user/info", () => {const user: GitUser = {id: "1",login: "octocat",@@ -15,9 +15,9 @@ export const AUTH_HANDLERS = [return HttpResponse.json(user);}),- http.post("/api/authenticate", async () =>+ http.post("*/api/authenticate", async () =>HttpResponse.json({ message: "Authenticated" }),),- http.post("/api/logout", () => HttpResponse.json(null, { status: 200 })),+ http.post("*/api/logout", () => HttpResponse.json(null, { status: 200 })),];diff --git a/src/mocks/automation-handlers.ts b/src/mocks/automation-handlers.tsindex 8c87c6f305..cbf28ae14b 100644--- a/src/mocks/automation-handlers.ts+++ b/src/mocks/automation-handlers.ts@@ -21,7 +21,7 @@ export const resetAutomationMockData = () => {export const AUTOMATION_HANDLERS = [// GET /api/automation/v1 β List automations- http.get("/api/automation/v1", async ({ request }) => {+ http.get("*/api/automation/v1", async ({ request }) => {await delay(300);const url = new URL(request.url);@@ -40,7 +40,7 @@ export const AUTOMATION_HANDLERS = [}),// GET /api/automation/v1/:id/runs β List automation runs- http.get("/api/automation/v1/:id/runs", async ({ params, request }) => {+ http.get("*/api/automation/v1/:id/runs", async ({ params, request }) => {await delay(200);const id = params.id as string;@@ -67,7 +67,7 @@ export const AUTOMATION_HANDLERS = [}),// GET /api/automation/v1/:id β Get automation detail- http.get("/api/automation/v1/:id", async ({ params }) => {+ http.get("*/api/automation/v1/:id", async ({ params }) => {await delay(200);const automation = automations.get(params.id as string);@@ -82,7 +82,7 @@ export const AUTOMATION_HANDLERS = [}),// PATCH /api/automation/v1/:id β Update automation (toggle enabled)- http.patch("/api/automation/v1/:id", async ({ params, request }) => {+ http.patch("*/api/automation/v1/:id", async ({ params, request }) => {await delay(200);const id = params.id as string;@@ -106,7 +106,7 @@ export const AUTOMATION_HANDLERS = [}),// DELETE /api/automation/v1/:id β Delete automation- http.delete("/api/automation/v1/:id", async ({ params }) => {+ http.delete("*/api/automation/v1/:id", async ({ params }) => {await delay(200);const id = params.id as string;diff --git a/src/mocks/conversation-handlers.ts b/src/mocks/conversation-handlers.tsindex 95b70b1a7d..c058f6bc8b 100644--- a/src/mocks/conversation-handlers.ts+++ b/src/mocks/conversation-handlers.ts@@ -69,7 +69,7 @@ function listConversationResponses(ids?: string[] | null) {}export const CONVERSATION_HANDLERS = [- http.get("/api/conversations/search", async ({ request }) => {+ http.get("*/api/conversations/search", async ({ request }) => {const url = new URL(request.url);const limit = Number(url.searchParams.get("limit") ?? "20");const items = Array.from(CONVERSATIONS.values())@@ -80,13 +80,13 @@ export const CONVERSATION_HANDLERS = [return HttpResponse.json({ items, next_page_id: null });}),- http.get("/api/conversations", async ({ request }) => {+ http.get("*/api/conversations", async ({ request }) => {const url = new URL(request.url);const ids = url.searchParams.getAll("ids");return HttpResponse.json(listConversationResponses(ids));}),- http.get("/api/conversations/:conversationId", async ({ params }) => {+ http.get("*/api/conversations/:conversationId", async ({ params }) => {const conversationId = params.conversationId as string;const conversation = CONVERSATIONS.get(conversationId);if (conversation) {@@ -95,7 +95,7 @@ export const CONVERSATION_HANDLERS = [return HttpResponse.json(null, { status: 404 });}),- http.post("/api/conversations", async () => {+ http.post("*/api/conversations", async () => {await delay();const conversation: MockConversation = {id: `${Math.floor(Math.random() * 100000)}`,@@ -131,7 +131,7 @@ export const CONVERSATION_HANDLERS = [},),- http.delete("/api/conversations/:conversationId", async ({ params }) => {+ http.delete("*/api/conversations/:conversationId", async ({ params }) => {const conversationId = params.conversationId as string;if (CONVERSATIONS.has(conversationId)) {CONVERSATIONS.delete(conversationId);@@ -140,40 +140,40 @@ export const CONVERSATION_HANDLERS = [return HttpResponse.json(null, { status: 404 });}),- http.get("/api/conversations/:conversationId/events/count", async () =>+ http.get("*/api/conversations/:conversationId/events/count", async () =>HttpResponse.json(0),),- http.get("/api/conversations/:conversationId/events/search", async () =>+ http.get("*/api/conversations/:conversationId/events/search", async () =>HttpResponse.json({ items: [] }),),- http.post("/api/conversations/:conversationId/events", async () =>+ http.post("*/api/conversations/:conversationId/events", async () =>HttpResponse.json({ ok: true }),),- http.post("/api/conversations/:conversationId/pause", async () =>+ http.post("*/api/conversations/:conversationId/pause", async () =>HttpResponse.json({ success: true }),),- http.post("/api/conversations/:conversationId/run", async () =>+ http.post("*/api/conversations/:conversationId/run", async () =>HttpResponse.json({ success: true }),),- http.post("/api/conversations/:conversationId/ask_agent", async () =>+ http.post("*/api/conversations/:conversationId/ask_agent", async () =>HttpResponse.json({ response: "Mock agent response" }),),- http.get("/api/vscode/url", async () => HttpResponse.json({ url: null })),+ http.get("*/api/vscode/url", async () => HttpResponse.json({ url: null })),- http.post("/api/skills", async () => HttpResponse.json({ skills: [] })),+ http.post("*/api/skills", async () => HttpResponse.json({ skills: [] })),http.post("/api/v1/conversations/:conversationId/pending-messages",async () => HttpResponse.json({ id: "mock-pending-id", position: 0 }),),- http.get("/api/conversations/:conversationId/microagents", async () => {+ http.get("*/api/conversations/:conversationId/microagents", async () => {const response: GetMicroagentsResponse = {microagents: [{diff --git a/src/mocks/feedback-handlers.ts b/src/mocks/feedback-handlers.tsindex 8e4e602b33..657f731fc7 100644--- a/src/mocks/feedback-handlers.ts+++ b/src/mocks/feedback-handlers.ts@@ -1,7 +1,7 @@import { http, delay, HttpResponse } from "msw";export const FEEDBACK_HANDLERS = [- http.post("/api/submit-feedback", async () => {+ http.post("*/api/submit-feedback", async () => {await delay(1200);return HttpResponse.json({statusCode: 200,@@ -9,7 +9,7 @@ export const FEEDBACK_HANDLERS = [});}),- http.post("/api/submit-feedback", async () =>+ http.post("*/api/submit-feedback", async () =>HttpResponse.json({ statusCode: 200 }, { status: 200 }),),];diff --git a/src/mocks/git-repository-handlers.ts b/src/mocks/git-repository-handlers.tsindex 65471df7fe..b1e58cd36a 100644--- a/src/mocks/git-repository-handlers.ts+++ b/src/mocks/git-repository-handlers.ts@@ -44,7 +44,7 @@ const MOCK_REPOSITORIES = {const MOCK_BRANCHES = generateMockBranches(25);export const GIT_REPOSITORY_HANDLERS = [- http.get("/api/user/repositories", async ({ request }) => {+ http.get("*/api/user/repositories", async ({ request }) => {await delay(500); // Simulate network delayconst url = new URL(request.url);@@ -129,7 +129,7 @@ export const GIT_REPOSITORY_HANDLERS = [return HttpResponse.json(responseRepos);}),- http.get("/api/user/search/repositories", async ({ request }) => {+ http.get("*/api/user/search/repositories", async ({ request }) => {await delay(300); // Simulate network delayconst url = new URL(request.url);@@ -173,7 +173,7 @@ export const GIT_REPOSITORY_HANDLERS = [}),// Repository branches endpoint- http.get("/api/user/repository/branches", async ({ request }) => {+ http.get("*/api/user/repository/branches", async ({ request }) => {await delay(300);const url = new URL(request.url);@@ -205,7 +205,7 @@ export const GIT_REPOSITORY_HANDLERS = [}),// Search repository branches endpoint- http.get("/api/user/search/branches", async ({ request }) => {+ http.get("*/api/user/search/branches", async ({ request }) => {await delay(200);const url = new URL(request.url);@@ -230,9 +230,9 @@ export const GIT_REPOSITORY_HANDLERS = [return HttpResponse.json(limitedBranches);}),- http.get("/api/git/changes", async () => HttpResponse.json([])),+ http.get("*/api/git/changes", async () => HttpResponse.json([])),- http.get("/api/git/diff", async () =>+ http.get("*/api/git/diff", async () =>HttpResponse.json({ original: "", modified: "" }),),];diff --git a/src/mocks/secrets-handlers.ts b/src/mocks/secrets-handlers.tsindex a8abf36d30..ad7d482fa1 100644--- a/src/mocks/secrets-handlers.ts+++ b/src/mocks/secrets-handlers.ts@@ -15,10 +15,19 @@ const secrets = new Map<string, { value: string; description?: string }>([/*** Mock handlers for the agent-server secrets API.* Routes: /api/settings/secrets and /api/settings/secrets/:name+ *+ * Uses wildcard "*" prefix to match both relative paths and absolute URLs+ * (e.g., http://127.0.0.1:8000/api/...) since the code uses absolute URLs+ * when VITE_BACKEND_BASE_URL is configured.*/export const SECRETS_HANDLERS = [// GET /api/settings/secrets - List all secrets (names and descriptions only)- http.get("/api/settings/secrets", async () => {+ http.get("*/api/settings/secrets", async ({ request }) => {+ // Exclude requests with a :name param (handled by the next handler)+ const url = new URL(request.url);+ const pathParts = url.pathname.split("/").filter(Boolean);+ if (pathParts.length > 3) return undefined; // Let it pass through to :name handler+const secretsList = Array.from(secrets.entries()).map(([name, { description }]) => ({ name, description }),);@@ -26,7 +35,7 @@ export const SECRETS_HANDLERS = [}),// GET /api/settings/secrets/:name - Get secret value by name- http.get("/api/settings/secrets/:name", async ({ params }) => {+ http.get("*/api/settings/secrets/:name", async ({ params }) => {const { name } = params;if (typeof name !== "string") {return HttpResponse.json({ detail: "Invalid name" }, { status: 400 });@@ -43,7 +52,7 @@ export const SECRETS_HANDLERS = [}),// PUT /api/settings/secrets - Create or update a secret (upsert)- http.put("/api/settings/secrets", async ({ request }) => {+ http.put("*/api/settings/secrets", async ({ request }) => {const body = (await request.json()) as {name: string;value: string;@@ -69,7 +78,7 @@ export const SECRETS_HANDLERS = [}),// DELETE /api/settings/secrets/:name - Delete a secret by name- http.delete("/api/settings/secrets/:name", async ({ params }) => {+ http.delete("*/api/settings/secrets/:name", async ({ params }) => {const { name } = params;if (typeof name !== "string") {return HttpResponse.json({ detail: "Invalid name" }, { status: 400 });diff --git a/src/mocks/settings-handlers.ts b/src/mocks/settings-handlers.tsindex 942cd0a11b..f8f0667c64 100644--- a/src/mocks/settings-handlers.ts+++ b/src/mocks/settings-handlers.ts@@ -332,9 +332,12 @@ const MOCK_VERIFIED_MODELS_BY_PROVIDER = MOCK_MODELS.reduce<}, {});// --- Handlers for options/config/settings ---+// Uses wildcard "*" prefix to match both relative paths and absolute URLs+// (e.g., http://127.0.0.1:8000/api/...) since the code uses absolute URLs+// when VITE_BACKEND_BASE_URL is configured.export const SETTINGS_HANDLERS = [- http.get("/server_info", async () =>+ http.get("*/server_info", async () =>HttpResponse.json({uptime: 0,idle_time: 0,@@ -352,20 +355,20 @@ export const SETTINGS_HANDLERS = [}),),- http.get("/api/llm/models", async () =>+ http.get("*/api/llm/models", async () =>HttpResponse.json({ models: MOCK_MODELS }),),- http.get("/api/llm/models/verified", async () =>+ http.get("*/api/llm/models/verified", async () =>HttpResponse.json({ models: MOCK_VERIFIED_MODELS_BY_PROVIDER }),),- http.get("/api/llm/providers", async () =>+ http.get("*/api/llm/providers", async () =>HttpResponse.json({ providers: MOCK_MODEL_PROVIDERS }),),// V0 (legacy) models endpoint β still used for default_model- http.get("/api/options/models", async () =>+ http.get("*/api/options/models", async () =>HttpResponse.json({models: MOCK_MODELS,verified_models: [@@ -378,7 +381,7 @@ export const SETTINGS_HANDLERS = [),// V1 providers search- http.get("/api/v1/config/providers/search", async ({ request }) => {+ http.get("*/api/v1/config/providers/search", async ({ request }) => {const url = new URL(request.url);const query = url.searchParams.get("query")?.toLowerCase();const verifiedEq = url.searchParams.get("verified__eq");@@ -409,7 +412,7 @@ export const SETTINGS_HANDLERS = [}),// V1 models search- http.get("/api/v1/config/models/search", async ({ request }) => {+ http.get("*/api/v1/config/models/search", async ({ request }) => {const url = new URL(request.url);const query = url.searchParams.get("query")?.toLowerCase();const verifiedEq = url.searchParams.get("verified__eq");@@ -439,11 +442,11 @@ export const SETTINGS_HANDLERS = [return HttpResponse.json({ items: models, next_page_id: null });}),- http.get("/api/options/security-analyzers", async () =>+ http.get("*/api/options/security-analyzers", async () =>HttpResponse.json(["llm", "none"]),),- http.get("/api/v1/web-client/config", () => {+ http.get("*/api/v1/web-client/config", () => {const config: WebClientConfig = {posthog_client_key: "fake-posthog-client-key",feature_flags: {@@ -461,17 +464,17 @@ export const SETTINGS_HANDLERS = [return HttpResponse.json(config);}),- http.get("/api/settings/conversation-schema", async () => {+ http.get("*/api/settings/conversation-schema", async () => {await delay();return HttpResponse.json(MOCK_CONVERSATION_SETTINGS_SCHEMA);}),- http.get("/api/v1/settings/conversation-schema", async () => {+ http.get("*/api/v1/settings/conversation-schema", async () => {await delay();return HttpResponse.json(MOCK_CONVERSATION_SETTINGS_SCHEMA);}),- http.get("/api/v1/settings", async () => {+ http.get("*/api/v1/settings", async () => {await delay();const { settings } = MOCK_USER_PREFERENCES;@@ -481,7 +484,12 @@ export const SETTINGS_HANDLERS = [}),// New settings API endpoints (GET /api/settings with X-Expose-Secrets header support)- http.get("/api/settings", async ({ request }) => {+ http.get("*/api/settings", async ({ request }) => {+ // Exclude sub-paths like /api/settings/agent-schema (handled by separate handlers)+ const url = new URL(request.url);+ const pathParts = url.pathname.split("/").filter(Boolean);+ if (pathParts.length > 2) return undefined;+await delay();const { settings } = MOCK_USER_PREFERENCES;@@ -531,7 +539,7 @@ export const SETTINGS_HANDLERS = [}),// PATCH /api/settings - incremental updates- http.patch("/api/settings", async ({ request }) => {+ http.patch("*/api/settings", async ({ request }) => {await delay();const body = (await request.json()) as {agent_settings_diff?: Record<string, unknown>;@@ -592,17 +600,17 @@ export const SETTINGS_HANDLERS = [});}),- http.get("/api/settings/agent-schema", async () => {+ http.get("*/api/settings/agent-schema", async () => {await delay();return HttpResponse.json(MOCK_AGENT_SETTINGS_SCHEMA);}),- http.get("/api/v1/settings/agent-schema", async () => {+ http.get("*/api/v1/settings/agent-schema", async () => {await delay();return HttpResponse.json(MOCK_AGENT_SETTINGS_SCHEMA);}),- http.post("/api/v1/settings", async ({ request }) => {+ http.post("*/api/v1/settings", async ({ request }) => {await delay();const body = (await request.json()) as Record<string, unknown> | null;diff --git a/src/mocks/task-suggestions-handlers.ts b/src/mocks/task-suggestions-handlers.tsindex c114d9c8d9..700e7f2ed9 100644--- a/src/mocks/task-suggestions-handlers.ts+++ b/src/mocks/task-suggestions-handlers.ts@@ -81,7 +81,7 @@ export const MOCK_TASKS = [...TASKS_1, ...TASKS_2];export const TASK_SUGGESTIONS_HANDLERS = [// Current endpoint with pagination- http.get("/api/v1/git/suggested-tasks/search", async ({ request }) => {+ http.get("*/api/v1/git/suggested-tasks/search", async ({ request }) => {const url = new URL(request.url);const limit = url.searchParams.get("limit");const pageId = url.searchParams.get("page_id");