Merge main into feature/notifications: resolve settings.ts conflict

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

frontend/__tests__/routes/_oh.test.tsx

@@ -58,6 +58,7 @@ describe("frontend/routes/_oh", () => {
   it("should render and capture the user's consent if oss mode", async () => {
     const user = userEvent.setup();
     const getConfigSpy = vi.spyOn(OpenHands, "getConfig");
+    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
     const handleCaptureConsentSpy = vi.spyOn(
       CaptureConsent,
       "handleCaptureConsent",
@@ -69,6 +70,11 @@ describe("frontend/routes/_oh", () => {
       POSTHOG_CLIENT_KEY: "test-key",
     });
 
+    // @ts-expect-error - We only care about the user_consents_to_analytics field
+    getSettingsSpy.mockResolvedValue({
+      user_consents_to_analytics: null,
+    });
+
     renderWithProviders(<RouteStub />);
 
     // The user has not consented to tracking

frontend/src/routes/_oh/route.tsx

@@ -48,9 +48,7 @@ export default function MainApp() {
   const { data: settings } = useSettings();
   const { migrateUserConsent } = useMigrateUserConsent();
 
-  const [consentFormIsOpen, setConsentFormIsOpen] = React.useState(
-    settings.USER_CONSENTS_TO_ANALYTICS === null,
-  );
+  const [consentFormIsOpen, setConsentFormIsOpen] = React.useState(false);
 
   const config = useConfig();
   const {
@@ -70,6 +68,13 @@ export default function MainApp() {
     }
   }, [settings?.LANGUAGE]);
 
+  React.useEffect(() => {
+    const consentFormModalIsOpen =
+      settings?.USER_CONSENTS_TO_ANALYTICS === null;
+
+    setConsentFormIsOpen(consentFormModalIsOpen);
+  }, [settings]);
+
   React.useEffect(() => {
     // Migrate user consent to the server if it was previously stored in localStorage
     migrateUserConsent({

frontend/src/services/settings.ts

@@ -14,7 +14,7 @@ export const DEFAULT_SETTINGS: Settings = {
   GITHUB_TOKEN_IS_SET: false,
   ENABLE_DEFAULT_CONDENSER: false,
   ENABLE_SOUND_NOTIFICATIONS: false,
-  USER_CONSENTS_TO_ANALYTICS: null,
+  USER_CONSENTS_TO_ANALYTICS: false,
 };
 
 /**

openhands/runtime/base.py

@@ -134,6 +134,10 @@ def setup_initial_env(self) -> None:
             self.add_env_vars(self.config.sandbox.runtime_startup_env_vars)
 
     def close(self) -> None:
+        """
+        This should only be called by conversation manager or closing the session.
+        If called for instance by error handling, it could prevent recovery.
+        """
         pass
 
     @classmethod
@@ -209,7 +213,6 @@ async def _handle_action(self, event: Action) -> None:
             self.log('error', f'Unexpected error while running action: {error_message}')
             self.log('error', f'Problematic action: {str(event)}')
             self.send_error_message(err_id, error_message)
-            self.close()
             return
 
         observation._cause = event.id  # type: ignore[attr-defined]

openhands/runtime/impl/remote/remote_runtime.py

@@ -341,8 +341,6 @@ def _wait_until_alive_impl(self):
                 f'Runtime (ID={self.runtime_id}) is not yet ready. Status: {pod_status}'
             )
         elif pod_status in ('failed', 'unknown', 'crashloopbackoff'):
-            # clean up the runtime
-            self.close()
             if pod_status == 'crashloopbackoff':
                 raise AgentRuntimeUnavailableError(
                     'Runtime crashed and is being restarted, potentially due to memory usage. Please try again.'