Merge branch 'main' into kevin

.github/workflows/stale.yml

@@ -19,3 +19,4 @@ jobs:
           close-issue-message: 'This issue was closed because it has been stalled for over 30 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for over 30 days with no activity.'
           days-before-close: 7
+          operations-per-run: 150

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

@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { renderWithProviders } from "test-utils";
 import { createRoutesStub } from "react-router";
+import { AxiosError } from "axios";
 import { Sidebar } from "#/components/features/sidebar/sidebar";
 import OpenHands from "#/api/open-hands";
 
@@ -153,11 +154,24 @@ describe("Sidebar", () => {
       expect(settingsModal).toBeInTheDocument();
     });
 
-    it("should open the settings modal if GET /settings fails", async () => {
-      vi.spyOn(OpenHands, "getSettings").mockRejectedValue(
-        new Error("Failed to fetch settings"),
+    it("should open the settings modal if GET /settings fails with a 404", async () => {
+      const error = new AxiosError(
+        "Request failed with status code 404",
+        "ERR_BAD_REQUEST",
+        undefined,
+        undefined,
+        {
+          status: 404,
+          statusText: "Not Found",
+          data: { message: "Settings not found" },
+          headers: {},
+          // @ts-expect-error - we only need the response object for this test
+          config: {},
+        },
       );
 
+      vi.spyOn(OpenHands, "getSettings").mockRejectedValue(error);
+
       renderSidebar();
 
       const settingsModal = await screen.findByTestId("ai-config-modal");

frontend/src/components/features/sidebar/sidebar.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { FaListUl } from "react-icons/fa";
 import { useDispatch } from "react-redux";
 import posthog from "posthog-js";
+import toast from "react-hot-toast";
 import { useGitHubUser } from "#/hooks/query/use-github-user";
 import { UserActions } from "./user-actions";
 import { AllHandsLogoButton } from "#/components/shared/buttons/all-hands-logo-button";
@@ -28,7 +29,11 @@ export function Sidebar() {
   const endSession = useEndSession();
   const user = useGitHubUser();
   const { data: config } = useConfig();
-  const { data: settings, isError: settingsError } = useSettings();
+  const {
+    data: settings,
+    error: settingsError,
+    isFetching: isFetchingSettings,
+  } = useSettings();
   const { mutateAsync: logout } = useLogout();
   const { saveUserSettings } = useCurrentSettings();
 
@@ -47,6 +52,16 @@ export function Sidebar() {
     }
   }, [user.isError]);
 
+  React.useEffect(() => {
+    // We don't show toast errors for settings in the global error handler
+    // because we have a special case for 404 errors
+    if (!isFetchingSettings && settingsError?.status !== 404) {
+      toast.error(
+        "Something went wrong while fetching settings. Please reload the page.",
+      );
+    }
+  }, [settingsError?.status, isFetchingSettings]);
+
   const handleEndSession = () => {
     dispatch(setCurrentAgentState(AgentState.LOADING));
     endSession();
@@ -106,7 +121,7 @@ export function Sidebar() {
       {accountSettingsModalOpen && (
         <AccountSettingsModal onClose={handleAccountSettingsModalClose} />
       )}
-      {(settingsError || settingsModalIsOpen) && (
+      {(settingsError?.status === 404 || settingsModalIsOpen) && (
         <SettingsModal
           settings={settings}
           onClose={() => setSettingsModalIsOpen(false)}

frontend/src/hooks/query/use-active-host.ts

@@ -23,6 +23,9 @@ export const useActiveHost = () => {
     },
     enabled: !RUNTIME_INACTIVE_STATES.includes(curAgentState),
     initialData: { hosts: [] },
+    meta: {
+      disableToast: true,
+    },
   });
 
   const apps = useQueries({
@@ -37,6 +40,9 @@ export const useActiveHost = () => {
         }
       },
       refetchInterval: 3000,
+      meta: {
+        disableToast: true,
+      },
     })),
   });
 

frontend/src/hooks/query/use-is-authed.ts

@@ -16,5 +16,8 @@ export const useIsAuthed = () => {
     enabled: !!appMode,
     staleTime: 1000 * 60 * 5, // 5 minutes
     retry: false,
+    meta: {
+      disableToast: true,
+    },
   });
 };

frontend/src/hooks/query/use-settings.ts

@@ -32,6 +32,9 @@ export const useSettings = () => {
     initialData: DEFAULT_SETTINGS,
     staleTime: 0,
     retry: false,
+    meta: {
+      disableToast: true,
+    },
   });
 
   React.useEffect(() => {

frontend/src/query-client-config.ts

@@ -1,13 +1,22 @@
 import { QueryClientConfig, QueryCache } from "@tanstack/react-query";
-import { renderToastIfError } from "./utils/render-toast-if-error";
-
-const QUERY_KEYS_TO_IGNORE = ["authenticated", "hosts", "settings"];
+import toast from "react-hot-toast";
+import { retrieveAxiosErrorMessage } from "./utils/retrieve-axios-error-message";
 
+const shownErrors = new Set<string>();
 export const queryClientConfig: QueryClientConfig = {
   queryCache: new QueryCache({
     onError: (error, query) => {
-      if (!QUERY_KEYS_TO_IGNORE.some((key) => query.queryKey.includes(key))) {
-        renderToastIfError(error);
+      if (!query.meta?.disableToast) {
+        const errorMessage = retrieveAxiosErrorMessage(error);
+
+        if (!shownErrors.has(errorMessage)) {
+          toast.error(errorMessage || "An error occurred");
+          shownErrors.add(errorMessage);
+
+          setTimeout(() => {
+            shownErrors.delete(errorMessage);
+          }, 3000);
+        }
       }
     },
   }),
@@ -18,7 +27,8 @@ export const queryClientConfig: QueryClientConfig = {
     },
     mutations: {
       onError: (error) => {
-        renderToastIfError(error);
+        const message = retrieveAxiosErrorMessage(error);
+        toast.error(message);
       },
     },
   },

frontend/src/utils/render-toast-if-error.ts → frontend/src/utils/retrieve-axios-error-message.ts

@@ -1,12 +1,11 @@
 import { AxiosError } from "axios";
-import toast from "react-hot-toast";
 import { isAxiosErrorWithResponse } from "./type-guards";
 
 /**
- * Renders a toast with the error message from an Axios error
+ * Retrieve the error message from an Axios error
  * @param error The error to render a toast for
  */
-export const renderToastIfError = (error: AxiosError) => {
+export const retrieveAxiosErrorMessage = (error: AxiosError) => {
   let errorMessage: string | null = null;
 
   if (isAxiosErrorWithResponse(error) && error.response?.data.error) {
@@ -15,5 +14,5 @@ export const renderToastIfError = (error: AxiosError) => {
     errorMessage = error.message;
   }
 
-  toast.error(errorMessage || "An error occurred");
+  return errorMessage || "An error occurred";
 };

openhands/runtime/utils/runtime_templates/Dockerfile.j2

@@ -63,7 +63,10 @@ RUN if [ -z "${RELEASE_TAG}" ]; then \
     tar -xzf ${RELEASE_TAG}-linux-${arch}.tar.gz && \
     mv -f ${RELEASE_TAG}-linux-${arch} ${OPENVSCODE_SERVER_ROOT} && \
     cp ${OPENVSCODE_SERVER_ROOT}/bin/remote-cli/openvscode-server ${OPENVSCODE_SERVER_ROOT}/bin/remote-cli/code && \
-    rm -f ${RELEASE_TAG}-linux-${arch}.tar.gz
+    rm -f ${RELEASE_TAG}-linux-${arch}.tar.gz && \
+    # Install our custom extension
+    mkdir -p ${OPENVSCODE_SERVER_ROOT}/extensions/openhands-hello-world && \
+    cp -r /openhands/code/openhands/runtime/utils/vscode-extensions/hello-world/* ${OPENVSCODE_SERVER_ROOT}/extensions/openhands-hello-world/
 
 {% endmacro %}
 
@@ -109,7 +112,6 @@ RUN \
 # rather than the current OpenHands release
 
 {{ setup_base_system() }}
-{{ setup_vscode_server() }}
 
 # Install micromamba
 RUN mkdir -p /openhands/micromamba/bin && \
@@ -145,6 +147,8 @@ COPY ./code/pyproject.toml ./code/poetry.lock /openhands/code/
 COPY ./code/openhands /openhands/code/openhands
 RUN chmod a+rwx /openhands/code/openhands/__init__.py
 
+{{ setup_vscode_server() }}
+
 # ================================================================
 # END: Build from versioned image
 # ================================================================

openhands/runtime/utils/vscode-extensions/hello-world/extension.js

@@ -0,0 +1,16 @@
+const vscode = require('vscode');
+
+function activate(context) {
+    let disposable = vscode.commands.registerCommand('openhands-hello-world.helloWorld', function () {
+        vscode.window.showInformationMessage('Hello from OpenHands!');
+    });
+
+    context.subscriptions.push(disposable);
+}
+
+function deactivate() {}
+
+module.exports = {
+    activate,
+    deactivate
+}

openhands/runtime/utils/vscode-extensions/hello-world/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "openhands-hello-world",
+    "displayName": "OpenHands Hello World",
+    "description": "A simple hello world extension for OpenHands",
+    "version": "0.0.1",
+    "publisher": "openhands",
+    "engines": {
+        "vscode": "^1.94.0"
+    },
+    "categories": [
+        "Other"
+    ],
+    "activationEvents": [
+        "onCommand:openhands-hello-world.helloWorld"
+    ],
+    "main": "./extension.js",
+    "contributes": {
+        "commands": [{
+            "command": "openhands-hello-world.helloWorld",
+            "title": "Hello World from OpenHands"
+        }]
+    }
+}

openhands/server/config/server_config.py

@@ -18,6 +18,8 @@ class ServerConfig(ServerConfigInterface):
     )
     conversation_manager_class: str = 'openhands.server.conversation_manager.standalone_conversation_manager.StandaloneConversationManager'
 
+    github_service_class: str = 'openhands.server.services.github_service.GitHubService'
+
     def verify_config(self):
         if self.config_cls:
             raise ValueError('Unexpected config path provided')

openhands/server/middleware.py

@@ -194,7 +194,7 @@ async def __call__(self, request: Request, call_next: Callable):
         settings = await settings_store.load()
 
         if settings and settings.github_token:
-            request.state.github_token = settings.github_token
+            request.state.github_token = settings.github_token.get_secret_value()
         else:
             request.state.github_token = None