Merge branch 'main' into bug-fixes

docs/modules/usage/installation.mdx

@@ -43,6 +43,10 @@
   - General: `Use the WSL 2 based engine` is enabled.
   - Resources > WSL Integration: `Enable integration with my default WSL distro` is enabled.
 
+  :::note
+  The docker command below to start the app must be run inside the WSL terminal.
+  :::
+
 </details>
 
 ## Start the App

evaluation/benchmarks/swe_bench/run_infer.py

@@ -139,6 +139,7 @@ def get_config(
             remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
             keep_runtime_alive=False,
             remote_runtime_init_timeout=3600,
+            remote_runtime_api_timeout=120,
             remote_runtime_resource_factor=get_instance_resource_factor(
                 dataset_name=metadata.dataset,
                 instance_id=instance['instance_id'],

frontend/__tests__/components/chat-message.test.tsx

@@ -1,6 +1,6 @@
-import { render, screen } from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { describe, it, expect, test } from "vitest";
+import { describe, it, expect } from "vitest";
 import { ChatMessage } from "#/components/features/chat/chat-message";
 
 describe("ChatMessage", () => {
@@ -45,7 +45,9 @@ describe("ChatMessage", () => {
 
     await user.click(copyToClipboardButton);
 
-    expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!");
+    await waitFor(() =>
+      expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!"),
+    );
   });
 
   it("should display an error toast if copying content to clipboard fails", async () => {});

frontend/__tests__/components/chat/expandable-message.test.tsx

@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import { screen } from "@testing-library/react";
 import { renderWithProviders } from "test-utils";
 import { ExpandableMessage } from "#/components/features/chat/expandable-message";
-import { vi } from "vitest";
+import { vi } from "vitest"
 
 vi.mock("react-i18next", async () => {
   const actual = await vi.importActual("react-i18next");

frontend/__tests__/components/features/analytics/analytics-consent-form-modal.test.tsx

@@ -0,0 +1,45 @@
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { AnalyticsConsentFormModal } from "#/components/features/analytics/analytics-consent-form-modal";
+import OpenHands from "#/api/open-hands";
+import { SettingsProvider } from "#/context/settings-context";
+import { AuthProvider } from "#/context/auth-context";
+
+describe("AnalyticsConsentFormModal", () => {
+  it("should call saveUserSettings with default settings on confirm reset settings", async () => {
+    const user = userEvent.setup();
+    const onCloseMock = vi.fn();
+    const saveUserSettingsSpy = vi.spyOn(OpenHands, "saveSettings");
+
+    render(<AnalyticsConsentFormModal onClose={onCloseMock} />, {
+      wrapper: ({ children }) => (
+        <AuthProvider>
+          <QueryClientProvider client={new QueryClient()}>
+            <SettingsProvider>{children}</SettingsProvider>
+          </QueryClientProvider>
+        </AuthProvider>
+      ),
+    });
+
+    const confirmButton = screen.getByTestId("confirm-preferences");
+    await user.click(confirmButton);
+
+    expect(saveUserSettingsSpy).toHaveBeenCalledWith({
+      user_consents_to_analytics: true,
+      agent: "CodeActAgent",
+      confirmation_mode: false,
+      enable_default_condenser: false,
+      github_token: undefined,
+      language: "en",
+      llm_api_key: undefined,
+      llm_base_url: "",
+      llm_model: "anthropic/claude-3-5-sonnet-20241022",
+      remote_runtime_resource_factor: 1,
+      security_analyzer: "",
+      unset_github_token: undefined,
+    });
+    expect(onCloseMock).toHaveBeenCalled();
+  });
+});

frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx

@@ -1,5 +1,14 @@
 import { render, screen, within } from "@testing-library/react";
-import { afterEach, describe, expect, it, test, vi } from "vitest";
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  it,
+  test,
+  vi,
+} from "vitest";
 import userEvent from "@testing-library/user-event";
 import { formatTimeDelta } from "#/utils/format-time-delta";
 import { ConversationCard } from "#/components/features/conversation-panel/conversation-card";
@@ -11,10 +20,18 @@ describe("ConversationCard", () => {
   const onChangeTitle = vi.fn();
   const onDownloadWorkspace = vi.fn();
 
+  beforeAll(() => {
+    vi.stubGlobal("window", { open: vi.fn() });
+  });
+
   afterEach(() => {
     vi.clearAllMocks();
   });
 
+  afterAll(() => {
+    vi.unstubAllGlobals();
+  });
+
   it("should render the conversation card", () => {
     render(
       <ConversationCard

frontend/__tests__/components/features/conversation-panel/conversation-panel.test.tsx

@@ -227,7 +227,7 @@ describe("ConversationPanel", () => {
   it("should call onClose after clicking a card", async () => {
     renderConversationPanel();
     const cards = await screen.findAllByTestId("conversation-card");
-    const firstCard = cards[0];
+    const firstCard = cards[1];
 
     await userEvent.click(firstCard);
 

frontend/__tests__/components/features/sidebar/sidebar.test.tsx

@@ -82,6 +82,10 @@ describe("Sidebar", () => {
         within(accountSettingsModal).getByLabelText(/GITHUB\$TOKEN_LABEL/i);
       await user.type(tokenInput, "new-token");
 
+      const analyticsConsentInput =
+        within(accountSettingsModal).getByTestId("analytics-consent");
+      await user.click(analyticsConsentInput);
+
       const saveButton =
         within(accountSettingsModal).getByTestId("save-settings");
       await user.click(saveButton);
@@ -96,6 +100,7 @@ describe("Sidebar", () => {
         llm_model: "anthropic/claude-3-5-sonnet-20241022",
         remote_runtime_resource_factor: 1,
         security_analyzer: "",
+        user_consents_to_analytics: true,
       });
     });
 

frontend/__tests__/components/feedback-form.test.tsx

@@ -32,7 +32,7 @@ describe("FeedbackForm", () => {
     screen.getByLabelText(I18nKey.FEEDBACK$PRIVATE_LABEL);
     screen.getByLabelText(I18nKey.FEEDBACK$PUBLIC_LABEL);
 
-    screen.getByRole("button", { name: I18nKey.FEEDBACK$CONTRIBUTE_LABEL });
+    screen.getByRole("button", { name: I18nKey.FEEDBACK$SHARE_LABEL });
     screen.getByRole("button", { name: I18nKey.FEEDBACK$CANCEL_LABEL });
   });
 

frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx

@@ -1,16 +1,74 @@
 import { screen, waitFor } from "@testing-library/react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { renderWithProviders } from "test-utils";
 import { AccountSettingsModal } from "#/components/shared/modals/account-settings/account-settings-modal";
 import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
 import OpenHands from "#/api/open-hands";
+import * as ConsentHandlers from "#/utils/handle-capture-consent";
 
 describe("AccountSettingsModal", () => {
+  const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
   const saveSettingsSpy = vi.spyOn(OpenHands, "saveSettings");
 
-  beforeEach(() => {
-    vi.resetAllMocks();
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it.skip("should set the appropriate user analytics consent default", async () => {
+    getSettingsSpy.mockResolvedValue({
+      ...MOCK_DEFAULT_USER_SETTINGS,
+      user_consents_to_analytics: true,
+    });
+    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
+
+    const analyticsConsentInput = screen.getByTestId("analytics-consent");
+    await waitFor(() => expect(analyticsConsentInput).toBeChecked());
+  });
+
+  it("should save the users consent to analytics when saving account settings", async () => {
+    const user = userEvent.setup();
+    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
+
+    const analyticsConsentInput = screen.getByTestId("analytics-consent");
+    await user.click(analyticsConsentInput);
+
+    const saveButton = screen.getByTestId("save-settings");
+    await user.click(saveButton);
+
+    expect(saveSettingsSpy).toHaveBeenCalledWith({
+      agent: "CodeActAgent",
+      confirmation_mode: false,
+      enable_default_condenser: false,
+      language: "en",
+      llm_base_url: "",
+      llm_model: "anthropic/claude-3-5-sonnet-20241022",
+      remote_runtime_resource_factor: 1,
+      security_analyzer: "",
+      user_consents_to_analytics: true,
+    });
+  });
+
+  it("should call handleCaptureConsent with the analytics consent value if the save is successful", async () => {
+    const user = userEvent.setup();
+    const handleCaptureConsentSpy = vi.spyOn(
+      ConsentHandlers,
+      "handleCaptureConsent",
+    );
+    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
+
+    const analyticsConsentInput = screen.getByTestId("analytics-consent");
+    await user.click(analyticsConsentInput);
+
+    const saveButton = screen.getByTestId("save-settings");
+    await user.click(saveButton);
+
+    expect(handleCaptureConsentSpy).toHaveBeenCalledWith(true);
+
+    await user.click(analyticsConsentInput);
+    await user.click(saveButton);
+
+    expect(handleCaptureConsentSpy).toHaveBeenCalledWith(false);
   });
 
   it("should send all settings data when saving account settings", async () => {
@@ -39,11 +97,11 @@ describe("AccountSettingsModal", () => {
       llm_model: "anthropic/claude-3-5-sonnet-20241022",
       remote_runtime_resource_factor: 1,
       security_analyzer: "",
+      user_consents_to_analytics: false,
     });
   });
 
   it("should render a checkmark and not the input if the github token is set", async () => {
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
     getSettingsSpy.mockResolvedValue({
       ...MOCK_DEFAULT_USER_SETTINGS,
       github_token_is_set: true,
@@ -61,7 +119,6 @@ describe("AccountSettingsModal", () => {
 
   it("should send an unset github token property when pressing disconnect", async () => {
     const user = userEvent.setup();
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
     getSettingsSpy.mockResolvedValue({
       ...MOCK_DEFAULT_USER_SETTINGS,
       github_token_is_set: true,
@@ -86,7 +143,6 @@ describe("AccountSettingsModal", () => {
 
   it("should not unset the github token when changing the language", async () => {
     const user = userEvent.setup();
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
     getSettingsSpy.mockResolvedValue({
       ...MOCK_DEFAULT_USER_SETTINGS,
       github_token_is_set: true,
@@ -111,6 +167,7 @@ describe("AccountSettingsModal", () => {
       llm_model: "anthropic/claude-3-5-sonnet-20241022",
       remote_runtime_resource_factor: 1,
       security_analyzer: "",
+      user_consents_to_analytics: false,
     });
   });
 });