Resolve merge conflict in MCP Proxy Manager

Co-authored-by: Xingyao Wang <xingyaoww@gmail.com>

.dockerignore

@@ -1,5 +1,23 @@
+# NodeJS
 frontend/node_modules
-config.toml
-.envrc
-.env
-.git
+
+# Configuration (except pyproject.toml)
+*.ini
+*.toml
+!pyproject.toml
+*.yml
+
+# Documentation (except README.md)
+*.md
+!README.md
+
+# Hidden files and directories
+.*
+__pycache__
+
+# Unneded files and directories
+/dev_config/
+/docs/
+/evaluation/
+/tests/
+CITATION.cff

.github/dependabot.yml

@@ -72,3 +72,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directories:
+      - "containers/*"
+    schedule:
+      interval: "weekly"

.openhands/microagents/repo.md

@@ -2,8 +2,6 @@ This repository contains the code for OpenHands, an automated AI software engine
 (in the `openhands` directory) and React frontend (in the `frontend` directory).
 
 ## General Setup:
-To set up the entire repo, including frontend and backend, run `make build`.
-You don't need to do this unless the user asks you to, or if you're trying to run the entire application.
 
 IMPORTANT: Before making any changes to the codebase, ALWAYS run `make install-pre-commit-hooks` to ensure pre-commit hooks are properly installed.
 
@@ -21,13 +19,91 @@ then re-run the command to ensure it passes. Common issues include:
 - Trailing whitespace
 - Missing newlines at end of files
 
+## Testing and Debugging
+
+### Environment Setup for Testing
+- Run `make build` to install all dependencies (only necessary for running tests):
+  ```bash
+  make build
+  ```
+  **IMPORTANT**: When using `execute_bash` to run `make build` or similar long-running commands, set the `timeout` parameter to a high value (e.g., 600 seconds):
+  ```
+  execute_bash(command="make build", timeout=600)
+  ```
+
+#### Docker Installation
+**NOTE: Docker installation is ONLY required for running runtime tests with the Docker runtime.**
+
+- Install Docker on Debian-based systems:
+  ```bash
+  sudo apt-get update
+  sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
+  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  sudo apt-get update
+  sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+  ```
+- Start Docker daemon (in container environments without systemd):
+  ```bash
+  sudo dockerd > /tmp/docker.log 2>&1 & sleep 5
+  ```
+- Verify Docker installation:
+  ```bash
+  sudo docker run hello-world
+  ```
+
+#### Development Environment Setup
+- Before running `make run`, ensure netcat is installed:
+  ```bash
+  sudo apt-get install -y netcat-openbsd
+  ```
+
+### Unit Tests
+- All unit tests are in `tests/unit/test_*.py`
+- To test new code, run `poetry run pytest tests/unit/test_xxx.py` where `xxx` is the appropriate file for the current functionality
+- Write all tests with pytest
+
+### Runtime Tests
+- Runtime tests are in `tests/runtime/test_*.py`
+- Run tests with different runtime implementations by setting the `TEST_RUNTIME` environment variable:
+  ```bash
+  # Use Docker runtime (default)
+  DEBUG=1 poetry run pytest -vvxss tests/runtime/test_bash.py
+  
+  # Use CLI runtime (more reliable in some environments)
+  DEBUG=1 TEST_RUNTIME=cli poetry run pytest -vvxss tests/runtime/test_bash.py
+  
+  # Run a specific test
+  DEBUG=1 TEST_RUNTIME=cli poetry run pytest -vvxss tests/runtime/test_bash.py::test_bash_server
+  ```
+- **IMPORTANT**: Runtime tests can take a long time to run, especially when building Docker images. Set a high timeout value:
+  ```
+  execute_bash(command="DEBUG=1 poetry run pytest -vvxss tests/runtime/test_bash.py", timeout=600)
+  ```
+- The `DEBUG=1` flag enables more verbose logging
+- The `-vvxss` flags make the test output more verbose and stop after the first failure
+
+### Debugging Docker Issues
+- Check Docker container status:
+  ```bash
+  sudo docker ps -a
+  ```
+- View Docker logs:
+  ```bash
+  sudo docker logs <container_id>
+  ```
+- Check Docker daemon logs:
+  ```bash
+  sudo cat /tmp/docker.log | tail -n 100
+  ```
+- Check OpenHands logs:
+  ```bash
+  cat logs/openhands_*.log | grep -i error | tail -n 20
+  ```
+
 ## Repository Structure
 Backend:
 - Located in the `openhands` directory
-- Testing:
-  - All tests are in `tests/unit/test_*.py`
-  - To test new code, run `poetry run pytest tests/unit/test_xxx.py` where `xxx` is the appropriate file for the current functionality
-  - Write all tests with pytest
 
 Frontend:
 - Located in the `frontend` directory
@@ -50,6 +126,13 @@ Frontend:
 
 If you are starting a pull request (PR), please follow the template in `.github/pull_request_template.md`.
 
+## Runtime Architecture
+- OpenHands uses a Docker-based runtime for secure execution of agent actions
+- The runtime builds a custom Docker image based on a specified base image
+- The image includes OpenHands-specific code and the runtime client
+- The runtime client executes actions in the sandboxed environment and returns observations
+- More details in the [runtime architecture documentation](https://docs.all-hands.dev/usage/architecture/runtime)
+
 ## Implementation Details
 
 These details may or may not be useful for your current task.
@@ -80,4 +163,4 @@ These details may or may not be useful for your current task.
      - Add the translation key to `frontend/src/i18n/declaration.ts`
   2. Add the setting to the backend:
      - Add the setting to the `Settings` model in `openhands/storage/data_models/settings.py`
-     - Update any relevant backend code to apply the setting (e.g., in session creation)
+     - Update any relevant backend code to apply the setting (e.g., in session creation)

containers/app/Dockerfile

@@ -1,16 +1,16 @@
 ARG OPENHANDS_BUILD_VERSION=dev
-FROM node:21.7.2-bookworm-slim AS frontend-builder
+FROM node:22.16.0-bookworm-slim AS frontend-builder
 
 WORKDIR /app
 
-COPY ./frontend/package.json frontend/package-lock.json ./
-RUN npm install -g npm@10.5.1
+COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
 
-COPY ./frontend ./
+COPY frontend ./
 RUN npm run build
 
-FROM python:3.12.3-slim AS backend-builder
+FROM python:3.12.10-slim AS base
+FROM base AS backend-builder
 
 WORKDIR /app
 ENV PYTHONPATH='/app'
@@ -22,17 +22,18 @@ ENV POETRY_NO_INTERACTION=1 \
 
 RUN apt-get update -y \
     && apt-get install -y curl make git build-essential \
-    && python3 -m pip install poetry==1.8.2  --break-system-packages
+    && python3 -m pip install poetry --break-system-packages
 
-COPY ./pyproject.toml ./poetry.lock ./
+COPY pyproject.toml poetry.lock ./
 RUN touch README.md
 RUN export POETRY_CACHE_DIR && poetry install --no-root && rm -rf $POETRY_CACHE_DIR
 
-FROM python:3.12.3-slim AS openhands-app
+FROM base AS openhands-app
 
 WORKDIR /app
 
-ARG OPENHANDS_BUILD_VERSION #re-declare for this section
+# re-declare for this section
+ARG OPENHANDS_BUILD_VERSION
 
 ENV RUN_AS_OPENHANDS=true
 # A random number--we need this to be different from the user's UID on the host machine
@@ -74,12 +75,7 @@ COPY --chown=openhands:app --chmod=770 --from=backend-builder ${VIRTUAL_ENV} ${V
 COPY --chown=openhands:app --chmod=770 ./microagents ./microagents
 COPY --chown=openhands:app --chmod=770 ./openhands ./openhands
 COPY --chown=openhands:app --chmod=777 ./openhands/runtime/plugins ./openhands/runtime/plugins
-COPY --chown=openhands:app --chmod=770 ./openhands/agenthub ./openhands/agenthub
-COPY --chown=openhands:app ./pyproject.toml ./pyproject.toml
-COPY --chown=openhands:app ./poetry.lock ./poetry.lock
-COPY --chown=openhands:app ./README.md ./README.md
-COPY --chown=openhands:app ./MANIFEST.in ./MANIFEST.in
-COPY --chown=openhands:app ./LICENSE ./LICENSE
+COPY --chown=openhands:app pyproject.toml poetry.lock README.md MANIFEST.in LICENSE ./
 
 # This is run as "openhands" user, and will create __pycache__ with openhands:openhands ownership
 RUN python openhands/core/download.py # No-op to download assets

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

@@ -4,7 +4,6 @@ import userEvent from "@testing-library/user-event";
 import { renderWithProviders } from "test-utils";
 import type { Message } from "#/message";
 import { SUGGESTIONS } from "#/utils/suggestions";
-import { WsClientProviderStatus } from "#/context/ws-client-provider";
 import { ChatInterface } from "#/components/features/chat/chat-interface";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -19,7 +18,7 @@ describe("Empty state", () => {
   const { useWsClient: useWsClientMock } = vi.hoisted(() => ({
     useWsClient: vi.fn(() => ({
       send: sendMock,
-      status: WsClientProviderStatus.CONNECTED,
+      status: "CONNECTED",
       isLoadingMessages: false,
     })),
   }));
@@ -64,7 +63,7 @@ describe("Empty state", () => {
       // this is to test that the message is in the UI before the socket is called
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       const user = userEvent.setup();
@@ -87,7 +86,7 @@ describe("Empty state", () => {
     async () => {
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       const user = userEvent.setup();
@@ -101,7 +100,7 @@ describe("Empty state", () => {
 
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       rerender(<ChatInterface />);

frontend/src/assets/stripe.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" style="enable-background:new 0 0 468 222.5" version="1.1" viewBox="0 0 468 222.5">
+  <style>
+    .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635bff}
+  </style>
+  <path d="M414 113.4c0-25.6-12.4-45.8-36.1-45.8-23.8 0-38.2 20.2-38.2 45.6 0 30.1 17 45.3 41.4 45.3 11.9 0 20.9-2.7 27.7-6.5v-20c-6.8 3.4-14.6 5.5-24.5 5.5-9.7 0-18.3-3.4-19.4-15.2h48.9c0-1.3.2-6.5.2-8.9zm-49.4-9.5c0-11.3 6.9-16 13.2-16 6.1 0 12.6 4.7 12.6 16h-25.8zM301.1 67.6c-9.8 0-16.1 4.6-19.6 7.8l-1.3-6.2h-22v116.6l25-5.3.1-28.3c3.6 2.6 8.9 6.3 17.7 6.3 17.9 0 34.2-14.4 34.2-46.1-.1-29-16.6-44.8-34.1-44.8zm-6 68.9c-5.9 0-9.4-2.1-11.8-4.7l-.1-37.1c2.6-2.9 6.2-4.9 11.9-4.9 9.1 0 15.4 10.2 15.4 23.3 0 13.4-6.2 23.4-15.4 23.4zM223.8 61.7l25.1-5.4V36l-25.1 5.3zM223.8 69.3h25.1v87.5h-25.1zM196.9 76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7 15.9-6.3 19-5.2v-23c-3.2-1.2-14.9-3.4-20.8 7.4zM146.9 47.6l-24.4 5.2-.1 80.1c0 14.8 11.1 25.7 25.9 25.7 8.2 0 14.2-1.5 17.5-3.3V135c-3.2 1.3-19 5.9-19-8.9V90.6h19V69.3h-19l.1-21.7zM79.3 94.7c0-3.9 3.2-5.4 8.5-5.4 7.6 0 17.2 2.3 24.8 6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6C67.5 67.6 54 78.2 54 95.9c0 27.6 38 23.2 38 35.1 0 4.6-4 6.1-9.6 6.1-8.3 0-18.9-3.4-27.3-8v23.8c9.3 4 18.7 5.7 27.3 5.7 20.8 0 35.1-10.3 35.1-28.2-.1-29.8-38.2-24.5-38.2-35.7z" class="st0"/>
+</svg>

frontend/src/components/features/controls/agent-status-bar.tsx

@@ -9,10 +9,7 @@ import {
   AGENT_STATUS_MAP,
   IndicatorColor,
 } from "../../agent-status-map.constant";
-import {
-  useWsClient,
-  WsClientProviderStatus,
-} from "#/context/ws-client-provider";
+import { useWsClient } from "#/context/ws-client-provider";
 import { useNotification } from "#/hooks/useNotification";
 import { browserTab } from "#/utils/browser-tab";
 import { useActiveConversation } from "#/hooks/query/use-active-conversation";
@@ -80,10 +77,13 @@ export function AgentStatusBar() {
   );
 
   React.useEffect(() => {
-    if (conversation?.status === "STARTING") {
+    if (conversation?.status === "CONNECTING") {
+      setStatusMessage(t(I18nKey.STATUS$CONNECTING_TO_RUNTIME));
+      setIndicatorColor(IndicatorColor.YELLOW);
+    } else if (conversation?.status === "STARTING") {
       setStatusMessage(t(I18nKey.STATUS$STARTING_RUNTIME));
       setIndicatorColor(IndicatorColor.RED);
-    } else if (status === WsClientProviderStatus.DISCONNECTED) {
+    } else if (status === "DISCONNECTED") {
       setStatusMessage(t(I18nKey.STATUS$WEBSOCKET_CLOSED));
       setIndicatorColor(IndicatorColor.RED);
     } else {

frontend/src/components/features/conversation-panel/conversation-state-indicator.tsx

@@ -2,9 +2,20 @@ import ColdIcon from "./state-indicators/cold.svg?react";
 import RunningIcon from "./state-indicators/running.svg?react";
 
 type SVGIcon = React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-export type ProjectStatus = "RUNNING" | "STOPPED" | "STARTING";
+export type ProjectStatus =
+  | "RUNNING"
+  | "STOPPED"
+  | "STARTING"
+  | "CONNECTING"
+  | "CONNECTED"
+  | "DISCONNECTED";
 
-const INDICATORS: Record<ProjectStatus, SVGIcon> = {
+type ProjectStatusWithIcon = Exclude<
+  ProjectStatus,
+  "CONNECTING" | "CONNECTED" | "DISCONNECTED"
+>;
+
+const INDICATORS: Record<ProjectStatusWithIcon, SVGIcon> = {
   STOPPED: ColdIcon,
   RUNNING: RunningIcon,
   STARTING: ColdIcon,
@@ -17,6 +28,7 @@ interface ConversationStateIndicatorProps {
 export function ConversationStateIndicator({
   status,
 }: ConversationStateIndicatorProps) {
+  // @ts-expect-error - Type 'ProjectStatus' is not assignable to type 'ProjectStatusWithIcon'.
   const StateIcon = INDICATORS[status];
 
   return (

frontend/src/components/features/payment/payment-form.tsx

@@ -9,6 +9,7 @@ import { BrandButton } from "../settings/brand-button";
 import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import { amountIsValid } from "#/utils/amount-is-valid";
 import { I18nKey } from "#/i18n/declaration";
+import { PoweredByStripeTag } from "./powered-by-stripe-tag";
 
 export function PaymentForm() {
   const { t } = useTranslation();
@@ -79,6 +80,7 @@ export function PaymentForm() {
             {t(I18nKey.PAYMENT$ADD_CREDIT)}
           </BrandButton>
           {isPending && <LoadingSpinner size="small" />}
+          <PoweredByStripeTag />
         </div>
       </div>
     </form>

frontend/src/components/features/payment/powered-by-stripe-tag.tsx

@@ -0,0 +1,16 @@
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import stripeLogo from "#/assets/stripe.svg";
+
+export function PoweredByStripeTag() {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex flex-row items-center">
+      <span className="text-medium font-semi-bold">
+        {t(I18nKey.BILLING$POWERED_BY)}
+      </span>
+      <img src={stripeLogo} alt="Stripe" className="h-8" />
+    </div>
+  );
+}

frontend/src/context/ws-client-provider.tsx

@@ -28,6 +28,7 @@ import {
 } from "#/types/core/guards";
 import { useOptimisticUserMessage } from "#/hooks/use-optimistic-user-message";
 import { useWSErrorMessage } from "#/hooks/use-ws-error-message";
+import { ProjectStatus } from "#/components/features/conversation-panel/conversation-state-indicator";
 
 const hasValidMessageProperty = (obj: unknown): obj is { message: string } =>
   typeof obj === "object" &&
@@ -67,14 +68,8 @@ const isMessageAction = (
 ): event is UserMessageAction | AssistantMessageAction =>
   isUserMessage(event) || isAssistantMessage(event);
 
-export enum WsClientProviderStatus {
-  CONNECTED,
-  DISCONNECTED,
-  CONNECTING,
-}
-
 interface UseWsClient {
-  status: WsClientProviderStatus;
+  status: ProjectStatus;
   isLoadingMessages: boolean;
   events: Record<string, unknown>[];
   parsedEvents: (OpenHandsAction | OpenHandsObservation)[];
@@ -82,7 +77,7 @@ interface UseWsClient {
 }
 
 const WsClientContext = React.createContext<UseWsClient>({
-  status: WsClientProviderStatus.DISCONNECTED,
+  status: "DISCONNECTED",
   isLoadingMessages: true,
   events: [],
   parsedEvents: [],
@@ -139,9 +134,7 @@ export function WsClientProvider({
   const { setErrorMessage, removeErrorMessage } = useWSErrorMessage();
   const queryClient = useQueryClient();
   const sioRef = React.useRef<Socket | null>(null);
-  const [status, setStatus] = React.useState(
-    WsClientProviderStatus.DISCONNECTED,
-  );
+  const [status, setStatus] = React.useState<ProjectStatus>("CONNECTING");
   const [events, setEvents] = React.useState<Record<string, unknown>[]>([]);
   const [parsedEvents, setParsedEvents] = React.useState<
     (OpenHandsAction | OpenHandsObservation)[]
@@ -162,7 +155,7 @@ export function WsClientProvider({
   }
 
   function handleConnect() {
-    setStatus(WsClientProviderStatus.CONNECTED);
+    setStatus("CONNECTED");
     removeErrorMessage();
   }
 
@@ -261,7 +254,7 @@ export function WsClientProvider({
   }
 
   function handleDisconnect(data: unknown) {
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("DISCONNECTED");
     const sio = sioRef.current;
     if (!sio) {
       return;
@@ -275,7 +268,7 @@ export function WsClientProvider({
 
   function handleError(data: unknown) {
     // set status
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("DISCONNECTED");
     updateStatusWhenErrorMessagePresent(data);
 
     setErrorMessage(
@@ -294,7 +287,7 @@ export function WsClientProvider({
     // reset events when conversationId changes
     setEvents([]);
     setParsedEvents([]);
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("CONNECTING");
   }, [conversationId]);
 
   React.useEffect(() => {

frontend/src/hooks/query/use-conversation-config.ts

@@ -1,9 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import React from "react";
-import {
-  useWsClient,
-  WsClientProviderStatus,
-} from "#/context/ws-client-provider";
+import { useWsClient } from "#/context/ws-client-provider";
 import { useConversationId } from "#/hooks/use-conversation-id";
 import OpenHands from "#/api/open-hands";
 
@@ -17,7 +14,7 @@ export const useConversationConfig = () => {
       if (!conversationId) throw new Error("No conversation ID");
       return OpenHands.getRuntimeId(conversationId);
     },
-    enabled: status !== WsClientProviderStatus.DISCONNECTED && !!conversationId,
+    enabled: status !== "DISCONNECTED" && !!conversationId,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes
   });

frontend/src/i18n/declaration.ts

@@ -1,5 +1,15 @@
 // this file generate by script, don't modify it manually!!!
 export enum I18nKey {
+  MICROAGENT$NO_REPOSITORY_FOUND = "MICROAGENT$NO_REPOSITORY_FOUND",
+  MICROAGENT$ADD_TO_MICROAGENT = "MICROAGENT$ADD_TO_MICROAGENT",
+  MICROAGENT$WHAT_TO_ADD = "MICROAGENT$WHAT_TO_ADD",
+  MICROAGENT$WHERE_TO_PUT = "MICROAGENT$WHERE_TO_PUT",
+  MICROAGENT$ADD_TRIGGER = "MICROAGENT$ADD_TRIGGER",
+  MICROAGENT$WAIT_FOR_RUNTIME = "MICROAGENT$WAIT_FOR_RUNTIME",
+  MICROAGENT$ADDING_CONTEXT = "MICROAGENT$ADDING_CONTEXT",
+  MICROAGENT$VIEW_CONVERSATION = "MICROAGENT$VIEW_CONVERSATION",
+  MICROAGENT$SUCCESS_PR_READY = "MICROAGENT$SUCCESS_PR_READY",
+  STATUS$CONNECTING_TO_RUNTIME = "STATUS$CONNECTING_TO_RUNTIME",
   STATUS$WEBSOCKET_CLOSED = "STATUS$WEBSOCKET_CLOSED",
   HOME$LAUNCH_FROM_SCRATCH = "HOME$LAUNCH_FROM_SCRATCH",
   HOME$READ_THIS = "HOME$READ_THIS",
@@ -470,6 +480,7 @@ export enum I18nKey {
   BILLING$YOUVE_GOT_50 = "BILLING$YOUVE_GOT_50",
   BILLING$ERROR_WHILE_CREATING_SESSION = "BILLING$ERROR_WHILE_CREATING_SESSION",
   BILLING$CLAIM_YOUR_50 = "BILLING$CLAIM_YOUR_50",
+  BILLING$POWERED_BY = "BILLING$POWERED_BY",
   BILLING$PROCEED_TO_STRIPE = "BILLING$PROCEED_TO_STRIPE",
   BILLING$YOURE_IN = "BILLING$YOURE_IN",
   PAYMENT$ADD_FUNDS = "PAYMENT$ADD_FUNDS",

frontend/src/i18n/translation.json

@@ -5855,6 +5855,22 @@
         "tr": "Konuşmalar",
         "uk": "Розмови"
     },
+    "STATUS$CONNECTING_TO_RUNTIME": {
+        "en": "Connecting to runtime...",
+        "zh-CN": "正在连接到运行时...",
+        "zh-TW": "正在連接到執行時...",
+        "de": "Verbinde mit der Laufzeitumgebung...",
+        "ko-KR": "런타임에 연결 중...",
+        "no": "Kobler til kjøretidsmiljø...",
+        "it": "Connessione all'ambiente di esecuzione in corso...",
+        "pt": "Conectando ao ambiente de execução...",
+        "es": "Conectando al entorno de ejecución...",
+        "ar": "جارٍ الاتصال ببيئة التشغيل...",
+        "fr": "Connexion à l'environnement d'exécution en cours...",
+        "tr": "Çalışma zamanı ortamına bağlanılıyor...",
+        "ja": "ランタイムに接続中",
+        "uk": "Підключення до середовища виконання..."
+    },
     "STATUS$STARTING_RUNTIME": {
         "en": "Starting runtime...",
         "zh-CN": "启动运行时...",
@@ -7519,6 +7535,22 @@
         "de": "Fügen Sie eine Kreditkarte mit Stripe hinzu, um $50 zu erhalten. <b>Wir belasten Sie nicht ohne vorherige Zustimmung!</b>",
         "uk": "Додайте кредитну картку до Stripe, щоб отримати свої 50 доларів. <b>Ми не стягуватимемо з вас плату без попереднього запиту!</b>"
     },
+    "BILLING$POWERED_BY": {
+        "en": "Powered by",
+        "ja": "提供：",
+        "zh-CN": "技术支持：",
+        "zh-TW": "技術支援：",
+        "ko-KR": "제공: ",
+        "no": "Drevet av",
+        "it": "Offerto da",
+        "pt": "Oferecido por",
+        "es": "Ofrecido por",
+        "ar": "مشغل بواسطة",
+        "fr": "Propulsé par",
+        "tr": "Tarafından desteklenmektedir",
+        "de": "Bereitgestellt von",
+        "uk": "Працює на базі"
+    },
     "BILLING$PROCEED_TO_STRIPE": {
         "en": "Add Billing Info",
         "ja": "請求情報を追加",

openhands/runtime/mcp/proxy/manager.py

@@ -36,7 +36,6 @@ class MCPProxyManager:
         Initialize the MCP Proxy Manager.
 
         Args:
-            name: Name of the proxy server
             auth_enabled: Whether authentication is enabled
             api_key: API key for authentication (required if auth_enabled is True)
             logger_level: Logging level for the FastMCP logger
@@ -59,7 +58,7 @@ class MCPProxyManager:
         """
         if len(self.config['mcpServers']) == 0:
             logger.info(
-                f"No MCP servers configured for FastMCP Proxy, skipping initialization."
+                'No MCP servers configured for FastMCP Proxy, skipping initialization.'
             )
             return None
 
@@ -70,7 +69,7 @@ class MCPProxyManager:
             api_key=self.api_key,
         )
 
-        logger.info(f"FastMCP Proxy initialized successfully")
+        logger.info('FastMCP Proxy initialized successfully')
 
     async def mount_to_app(
         self, app: FastAPI, allow_origins: Optional[list[str]] = None
@@ -83,9 +82,7 @@ class MCPProxyManager:
             allow_origins: List of allowed origins for CORS
         """
         if len(self.config['mcpServers']) == 0:
-            logger.info(
-                f"No MCP servers configured for FastMCP Proxy, skipping mount."
-            )
+            logger.info('No MCP servers configured for FastMCP Proxy, skipping mount.')
             return
 
         if not self.proxy:
@@ -101,8 +98,7 @@ class MCPProxyManager:
             app.routes.remove('/mcp')
 
         app.mount('/', mcp_app)
-        logger.info(f"Mounted FastMCP Proxy app at /mcp")
-
+        logger.info('Mounted FastMCP Proxy app at /mcp')
 
     async def update_and_remount(
         self,
@@ -119,13 +115,10 @@ class MCPProxyManager:
 
         Args:
             app: FastAPI application to mount to
-            tools: List of tool configurations
+            stdio_servers: List of stdio server configurations
             allow_origins: List of allowed origins for CORS
         """
-        tools = {
-            t.name: t.model_dump()
-            for t in stdio_servers
-        }
+        tools = {t.name: t.model_dump() for t in stdio_servers}
         self.config['mcpServers'] = tools
 
         del self.proxy

openhands/server/utils.py

@@ -26,7 +26,7 @@ async def get_conversation(
         conversation_id, user_id
     )
     if not conversation:
-        logger.warn(
+        logger.warning(
             f'get_conversation: conversation {conversation_id} not found, attach_to_conversation returned None',
             extra={'session_id': conversation_id, 'user_id': user_id},
         )