Skip to content

🙌 OpenHands: AI-Driven Development

settings: expose SDK settings schema to OpenHands (#13306)

Graham Neubigb4da0e1c69b3
diff --git a/dev_config/python/.pre-commit-config.yaml b/dev_config/python/.pre-commit-config.yaml
index 5cbdc1c508..f55569b7c0 100644
--- a/dev_config/python/.pre-commit-config.yaml
+++ b/dev_config/python/.pre-commit-config.yaml
@@ -58,8 +58,8 @@ repos:
types-Markdown,
pydantic,
lxml,
- "openhands-sdk==1.16.1",
- "openhands-tools==1.16.1",
+ "openhands-sdk==1.17.0",
+ "openhands-tools==1.17.0",
]
# To see gaps add `--html-report mypy-report/`
entry: mypy --config-file dev_config/python/mypy.ini openhands/
diff --git a/enterprise/integrations/github/github_solvability.py b/enterprise/integrations/github/github_solvability.py
index c7aaddd184..ba6e79e7f9 100644
--- a/enterprise/integrations/github/github_solvability.py
+++ b/enterprise/integrations/github/github_solvability.py
@@ -106,16 +106,18 @@ async def summarize_issue_solvability(
f'Solvability analysis disabled for user {github_view.user_info.user_id}'
)
- if user_settings.llm_api_key is None:
+ agent_settings = user_settings.agent_settings
+ llm_settings = agent_settings.llm
+ if llm_settings.api_key is None:
raise ValueError(
f'[Solvability] No LLM API key found for user {github_view.user_info.user_id}'
)
try:
llm_config = LLMConfig(
- model=user_settings.llm_model,
- api_key=user_settings.llm_api_key.get_secret_value(),
- base_url=user_settings.llm_base_url,
+ model=llm_settings.model,
+ api_key=llm_settings.api_key.get_secret_value(),
+ base_url=llm_settings.base_url,
)
except ValidationError as e:
raise ValueError(
diff --git a/enterprise/migrations/versions/107_add_agent_settings_to_enterprise_settings.py b/enterprise/migrations/versions/107_add_agent_settings_to_enterprise_settings.py
new file mode 100644
index 0000000000..49f4e38d45
--- /dev/null
+++ b/enterprise/migrations/versions/107_add_agent_settings_to_enterprise_settings.py
@@ -0,0 +1,300 @@
+"""Add agent_settings columns to enterprise settings tables.
+
+Revision ID: 107
+Revises: 106
+Create Date: 2026-03-22 00:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = '107'
+down_revision: Union[str, None] = '106'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+_EMPTY_JSON = sa.text("'{}'::json")
+
+
+def upgrade() -> None:
+ op.add_column(
+ 'user_settings',
+ sa.Column(
+ 'agent_settings', sa.JSON(), nullable=False, server_default=_EMPTY_JSON
+ ),
+ )
+ op.add_column(
+ 'user_settings',
+ sa.Column(
+ 'conversation_settings',
+ sa.JSON(),
+ nullable=False,
+ server_default=_EMPTY_JSON,
+ ),
+ )
+ op.add_column(
+ 'org_member',
+ sa.Column(
+ 'agent_settings_diff',
+ sa.JSON(),
+ nullable=False,
+ server_default=_EMPTY_JSON,
+ ),
+ )
+ op.add_column(
+ 'org_member',
+ sa.Column(
+ 'conversation_settings_diff',
+ sa.JSON(),
+ nullable=False,
+ server_default=_EMPTY_JSON,
+ ),
+ )
+ op.add_column(
+ 'org',
+ sa.Column(
+ 'agent_settings', sa.JSON(), nullable=False, server_default=_EMPTY_JSON
+ ),
+ )
+ op.add_column(
+ 'org',
+ sa.Column(
+ 'conversation_settings',
+ sa.JSON(),
+ nullable=False,
+ server_default=_EMPTY_JSON,
+ ),
+ )
+
+ op.add_column('org', sa.Column('_llm_api_key', sa.String(), nullable=True))
+ op.add_column(
+ 'org_member',
+ sa.Column(
+ 'has_custom_llm_api_key',
+ sa.Boolean(),
+ nullable=False,
+ server_default=sa.false(),
+ ),
+ )
+
+ op.execute(
+ sa.text(
+ """
+ UPDATE user_settings
+ SET agent_settings = jsonb_strip_nulls(
+ jsonb_build_object(
+ 'schema_version', 1,
+ 'agent', agent,
+ 'llm.model', llm_model,
+ 'llm.base_url', llm_base_url,
+ 'verification.confirmation_mode', confirmation_mode,
+ 'verification.security_analyzer', security_analyzer,
+ 'condenser.enabled', enable_default_condenser,
+ 'condenser.max_size', condenser_max_size,
+ 'max_iterations', max_iterations
+ ) || COALESCE(agent_settings::jsonb, '{}'::jsonb)
+ )::json
+ """
+ )
+ )
+ op.execute(
+ sa.text(
+ """
+ UPDATE org_member
+ SET agent_settings_diff = jsonb_strip_nulls(
+ jsonb_build_object(
+ 'schema_version', 1,
+ 'llm.model', llm_model,
+ 'llm.base_url', llm_base_url,
+ 'max_iterations', max_iterations,
+ 'mcp_config', mcp_config
+ ) || COALESCE(agent_settings_diff::jsonb, '{}'::jsonb)
+ )::json
+ """
+ )
+ )
+ op.execute(
+ sa.text(
+ """
+ UPDATE org
+ SET agent_settings = jsonb_strip_nulls(
+ jsonb_build_object(
+ 'schema_version', 1,
+ 'agent', agent,
+ 'llm.model', default_llm_model,
+ 'llm.base_url', default_llm_base_url,
+ 'verification.confirmation_mode', confirmation_mode,
+ 'verification.security_analyzer', security_analyzer,
+ 'condenser.enabled', enable_default_condenser,
+ 'condenser.max_size', condenser_max_size,
+ 'max_iterations', default_max_iterations,
+ 'mcp_config', mcp_config
+ ) || COALESCE(agent_settings::jsonb, '{}'::jsonb)
+ )::json
+ """
+ )
+ )
+
+ op.alter_column('user_settings', 'agent_settings', server_default=None)
+ op.alter_column('user_settings', 'conversation_settings', server_default=None)
+ op.alter_column('org_member', 'agent_settings_diff', server_default=None)
+ op.alter_column('org_member', 'conversation_settings_diff', server_default=None)
+ op.alter_column('org', 'agent_settings', server_default=None)
+ op.alter_column('org', 'conversation_settings', server_default=None)
+ op.alter_column('org_member', 'has_custom_llm_api_key', server_default=None)
+ op.drop_column('user_settings', 'agent')
+ op.drop_column('user_settings', 'max_iterations')
+ op.drop_column('user_settings', 'security_analyzer')
+ op.drop_column('user_settings', 'confirmation_mode')
+ op.drop_column('user_settings', 'llm_model')
+ op.drop_column('user_settings', 'llm_base_url')
+ op.drop_column('user_settings', 'enable_default_condenser')
+ op.drop_column('user_settings', 'condenser_max_size')
+ op.drop_column('org_member', 'max_iterations')
+ op.drop_column('org_member', 'llm_model')
+ op.drop_column('org_member', 'llm_base_url')
+ op.drop_column('org_member', 'mcp_config')
+ op.drop_column('org', 'agent')
+ op.drop_column('org', 'default_max_iterations')
+ op.drop_column('org', 'security_analyzer')
+ op.drop_column('org', 'confirmation_mode')
+ op.drop_column('org', 'default_llm_model')
+ op.drop_column('org', 'default_llm_base_url')
+ op.drop_column('org', 'enable_default_condenser')
+ op.drop_column('org', 'mcp_config')
+ op.drop_column('org', 'condenser_max_size')
+
+
+def downgrade() -> None:
+ op.add_column('user_settings', sa.Column('agent', sa.String(), nullable=True))
+ op.add_column(
+ 'user_settings', sa.Column('max_iterations', sa.Integer(), nullable=True)
+ )
+ op.add_column(
+ 'user_settings', sa.Column('security_analyzer', sa.String(), nullable=True)
+ )
+ op.add_column(
+ 'user_settings', sa.Column('confirmation_mode', sa.Boolean(), nullable=True)
+ )
+ op.add_column('user_settings', sa.Column('llm_model', sa.String(), nullable=True))
+ op.add_column(
+ 'user_settings', sa.Column('llm_base_url', sa.String(), nullable=True)
+ )
+ op.add_column(
+ 'user_settings',
+ sa.Column(
+ 'enable_default_condenser',
+ sa.Boolean(),
+ nullable=False,
+ server_default=sa.true(),
+ ),
+ )
+ op.add_column(
+ 'user_settings', sa.Column('condenser_max_size', sa.Integer(), nullable=True)
+ )
+ op.add_column('org_member', sa.Column('llm_base_url', sa.String(), nullable=True))
+ op.add_column('org_member', sa.Column('llm_model', sa.String(), nullable=True))
+ op.add_column(
+ 'org_member', sa.Column('max_iterations', sa.Integer(), nullable=True)
+ )
+ op.add_column('org_member', sa.Column('mcp_config', sa.JSON(), nullable=True))
+ op.add_column('org', sa.Column('agent', sa.String(), nullable=True))
+ op.add_column(
+ 'org', sa.Column('default_max_iterations', sa.Integer(), nullable=True)
+ )
+ op.add_column('org', sa.Column('security_analyzer', sa.String(), nullable=True))
+ op.add_column('org', sa.Column('confirmation_mode', sa.Boolean(), nullable=True))
+ op.add_column('org', sa.Column('default_llm_model', sa.String(), nullable=True))
+ op.add_column('org', sa.Column('default_llm_base_url', sa.String(), nullable=True))
+ op.add_column(
+ 'org',
+ sa.Column(
+ 'enable_default_condenser',
+ sa.Boolean(),
+ nullable=False,
+ server_default=sa.true(),
+ ),
+ )
+ op.add_column('org', sa.Column('mcp_config', sa.JSON(), nullable=True))
+ op.add_column('org', sa.Column('condenser_max_size', sa.Integer(), nullable=True))
+
+ op.execute(
+ sa.text(
+ """
+ UPDATE user_settings
+ SET
+ agent = agent_settings ->> 'agent',
+ max_iterations = NULLIF(agent_settings ->> 'max_iterations', '')::integer,
+ security_analyzer =
+ agent_settings ->> 'verification.security_analyzer',
+ confirmation_mode = CASE
+ WHEN agent_settings::jsonb ? 'verification.confirmation_mode'
+ THEN (agent_settings ->> 'verification.confirmation_mode')::boolean
+ ELSE NULL
+ END,
+ llm_model = agent_settings ->> 'llm.model',
+ llm_base_url = agent_settings ->> 'llm.base_url',
+ enable_default_condenser = CASE
+ WHEN agent_settings::jsonb ? 'condenser.enabled'
+ THEN (agent_settings ->> 'condenser.enabled')::boolean
+ ELSE TRUE
+ END,
+ condenser_max_size =
+ NULLIF(agent_settings ->> 'condenser.max_size', '')::integer
+ """
+ )
+ )
+ op.execute(
+ sa.text(
+ """
+ UPDATE org_member
+ SET
+ llm_model = agent_settings_diff ->> 'llm.model',
+ llm_base_url = agent_settings_diff ->> 'llm.base_url',
+ max_iterations =
+ NULLIF(agent_settings_diff ->> 'max_iterations', '')::integer,
+ mcp_config = agent_settings_diff -> 'mcp_config'
+ """
+ )
+ )
+ op.execute(
+ sa.text(
+ """
+ UPDATE org
+ SET
+ agent = agent_settings ->> 'agent',
+ default_max_iterations =
+ NULLIF(agent_settings ->> 'max_iterations', '')::integer,
+ security_analyzer =
+ agent_settings ->> 'verification.security_analyzer',
+ confirmation_mode = CASE
+ WHEN agent_settings::jsonb ? 'verification.confirmation_mode'
+ THEN (agent_settings ->> 'verification.confirmation_mode')::boolean
+ ELSE NULL
+ END,
+ default_llm_model = agent_settings ->> 'llm.model',
+ default_llm_base_url = agent_settings ->> 'llm.base_url',
+ enable_default_condenser = CASE
+ WHEN agent_settings::jsonb ? 'condenser.enabled'
+ THEN (agent_settings ->> 'condenser.enabled')::boolean
+ ELSE TRUE
+ END,
+ mcp_config = agent_settings -> 'mcp_config',
+ condenser_max_size =
+ NULLIF(agent_settings ->> 'condenser.max_size', '')::integer
+ """
+ )
+ )
+ op.drop_column('org', 'agent_settings')
+ op.drop_column('org', 'conversation_settings')
+ op.drop_column('org', '_llm_api_key')
+ op.drop_column('org_member', 'agent_settings_diff')
+ op.drop_column('org_member', 'conversation_settings_diff')
+ op.drop_column('org_member', 'has_custom_llm_api_key')
+ op.drop_column('user_settings', 'agent_settings')
+ op.drop_column('user_settings', 'conversation_settings')
diff --git a/enterprise/poetry.lock b/enterprise/poetry.lock
index df1440c9c8..cadac938cd 100644
--- a/enterprise/poetry.lock
+++ b/enterprise/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.3.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.
[[package]]
name = "agent-client-protocol"
@@ -3585,7 +3585,7 @@ files = [
[package.dependencies]
googleapis-common-protos = ">=1.5.5"
grpcio = ">=1.67.1"
-protobuf = ">=5.26.1,<6.0.dev0"
+protobuf = ">=5.26.1,<6.0dev"
[[package]]
name = "gspread"
@@ -3906,7 +3906,7 @@ pfzy = ">=0.3.1,<0.4.0"
prompt-toolkit = ">=3.0.1,<4.0.0"
[package.extras]
-docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17b43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
[[package]]
name = "installer"
@@ -4348,7 +4348,7 @@ fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""}
-jsonschema-specifications = ">=2023.3.6"
+jsonschema-specifications = ">=2023.03.6"
referencing = ">=0.28.4"
rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""}
@@ -4756,7 +4756,7 @@ files = [
]
[package.dependencies]
-certifi = ">=14.5.14"
+certifi = ">=14.05.14"
durationpy = ">=0.7"
python-dateutil = ">=2.5.3"
pyyaml = ">=5.4.1"
@@ -4890,25 +4890,24 @@ valkey = ["valkey (>=6)"]
[[package]]
name = "litellm"
-version = "1.80.10"
+version = "1.83.0"
description = "Library to easily interface with LLM API providers"
optional = false
python-versions = "<4.0,>=3.9"
groups = ["main"]
files = [
- {file = "litellm-1.80.10-py3-none-any.whl", hash = "sha256:9b3e561efaba0eb1291cb1555d3dcb7283cf7f3cb65aadbcdb42e2a8765898c8"},
- {file = "litellm-1.80.10.tar.gz", hash = "sha256:4a4aff7558945c2f7e5c6523e67c1b5525a46b10b0e1ad6b8f847cb13b16779e"},
+ {file = "litellm-1.83.0-py3-none-any.whl", hash = "sha256:88c536d339248f3987571493015784671ba3f193a328e1ea6780dbebaa2094a8"},
+ {file = "litellm-1.83.0.tar.gz", hash = "sha256:860bebc76c4bb27b4cf90b4a77acd66dba25aced37e3db98750de8a1766bfb7a"},
]
[package.dependencies]
aiohttp = ">=3.10"
click = "*"
fastuuid = ">=0.13.0"
-grpcio = {version = ">=1.62.3,<1.68.0", markers = "python_version < \"3.14\""}
httpx = ">=0.23.0"
importlib-metadata = ">=6.8.0"
jinja2 = ">=3.1.2,<4.0.0"
-jsonschema = ">=4.22.0,<5.0.0"
+jsonschema = ">=4.23.0,<5.0.0"
openai = ">=2.8.0"
pydantic = ">=2.5.0,<3.0.0"
python-dotenv = ">=0.2.0"
@@ -4917,9 +4916,11 @@ tokenizers = "*"
[package.extras]
caching = ["diskcache (>=5.6.1,<6.0.0)"]
-extra-proxy = ["azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
+extra-proxy = ["a2a-sdk (>=0.3.22,<0.4.0) ; python_version >= \"3.10\"", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (>=0.11.0,<0.12.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
+google = ["google-cloud-aiplatform (>=1.38.0)"]
+grpc = ["grpcio (>=1.62.3,<1.68.dev0 || >1.71.0,!=1.71.1,!=1.72.0,!=1.72.1,!=1.73.0) ; python_version < \"3.14\"", "grpcio (>=1.75.0) ; python_version >= \"3.14\""]
mlflow = ["mlflow (>3.1.4) ; python_version >= \"3.10\""]
-proxy = ["PyJWT (>=2.10.1,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.25)", "litellm-proxy-extras (==0.4.14)", "mcp (>=1.21.2,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.31.1,<0.32.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
+proxy = ["PyJWT (>=2.12.0,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (>=1.40.76,<2.0.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.35)", "litellm-proxy-extras (>=0.4.62,<0.5.0)", "mcp (>=1.25.0,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "pyroscope-io (>=0.8,<0.9) ; sys_platform != \"win32\"", "python-multipart (>=0.0.20)", "pyyaml (>=6.0.1,<7.0.0)", "rich (>=13.7.1,<14.0.0)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.32.1,<1.0.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
semantic-router = ["semantic-router (>=0.1.12) ; python_version >= \"3.9\" and python_version < \"3.14\""]
utils = ["numpydoc"]
@@ -6453,14 +6454,14 @@ llama = ["llama-index (>=0.12.29,<0.13.0)", "llama-index-core (>=0.12.29,<0.13.0
[[package]]
name = "openhands-agent-server"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_agent_server-1.16.1-py3-none-any.whl", hash = "sha256:015983b300510c9c329c8eace49fbd4117d31d0895a125e419c31a9964be4155"},
- {file = "openhands_agent_server-1.16.1.tar.gz", hash = "sha256:489151d35250a424dede8646396bef7b7095adb25e5c973ca8bc6dcbd19cdf07"},
+ {file = "openhands_agent_server-1.17.0-py3-none-any.whl", hash = "sha256:44336cad001c31caeb516481a5a7aea6dd9b5ab4798461f147b5231668d8fb74"},
+ {file = "openhands_agent_server-1.17.0.tar.gz", hash = "sha256:3a88449a3b9ded653dcd2a8c518810c75602873cf9f7d4e8f9b90fd8fd225652"},
]
[package.dependencies]
@@ -6522,9 +6523,9 @@ memory-profiler = ">=0.61"
numpy = "*"
openai = "2.8"
openhands-aci = "0.3.3"
-openhands-agent-server = "1.16.1"
-openhands-sdk = "1.16.1"
-openhands-tools = "1.16.1"
+openhands-agent-server = "1.17"
+openhands-sdk = "1.17"
+openhands-tools = "1.17"
opentelemetry-api = ">=1.33.1"
opentelemetry-exporter-otlp-proto-grpc = ">=1.33.1"
orjson = ">=3.11.6"
@@ -6579,14 +6580,14 @@ url = ".."
[[package]]
name = "openhands-sdk"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands SDK - Core functionality for building AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_sdk-1.16.1-py3-none-any.whl", hash = "sha256:0b487929e03e8c87ac6d99f37ff5314df3db6af70a06b516b0858327f9744f2b"},
- {file = "openhands_sdk-1.16.1.tar.gz", hash = "sha256:12f203c3766800bdf5d9dd4dd0a7988b88e13ff4954b0c208903778111e29567"},
+ {file = "openhands_sdk-1.17.0-py3-none-any.whl", hash = "sha256:3b771e72209453871c3036a562cf33e9ad9642a54bd48edb44f89915ac54709d"},
+ {file = "openhands_sdk-1.17.0.tar.gz", hash = "sha256:3c69df6590f023a514137272d413658848e0d5bc9aecf941b946c8662862779a"},
]
[package.dependencies]
@@ -6596,7 +6597,7 @@ fakeredis = {version = ">=2.32.1", extras = ["lua"]}
fastmcp = ">=3.0.0"
filelock = ">=3.20.1"
httpx = {version = ">=0.27.0", extras = ["socks"]}
-litellm = "1.80.10"
+litellm = ">=1.82.6,<1.82.7 || >1.82.7,<1.82.8 || >1.82.8"
lmnr = ">=0.7.24"
pydantic = ">=2.12.5"
python-frontmatter = ">=1.1.0"
@@ -6609,14 +6610,14 @@ boto3 = ["boto3 (>=1.35.0)"]
[[package]]
name = "openhands-tools"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands Tools - Runtime tools for AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_tools-1.16.1-py3-none-any.whl", hash = "sha256:f7fd1eb205571d02ee480ad71e96cac0c34c57c0938c4074fe135a579a7538d7"},
- {file = "openhands_tools-1.16.1.tar.gz", hash = "sha256:64488f2d7705ff90f4bfb7dfd1a2f1fbb4f379059d96e0073677c168d97135e7"},
+ {file = "openhands_tools-1.17.0-py3-none-any.whl", hash = "sha256:76cd30fcc153627444f18638bcd926c9190989f80a3492381e84a181c021d815"},
+ {file = "openhands_tools-1.17.0.tar.gz", hash = "sha256:4a9d6c1aec00d366d0feb1ac2e9ee9988ad9806a0ef89f7dbe4655644e639d4a"},
]
[package.dependencies]
@@ -7140,7 +7141,7 @@ files = [
]
[package.extras]
-docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17b43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
[[package]]
name = "pg8000"
@@ -13111,10 +13112,10 @@ files = [
]
[package.dependencies]
-botocore = ">=1.37.4,<2.0a0"
+botocore = ">=1.37.4,<2.0a.0"
[package.extras]
-crt = ["botocore[crt] (>=1.37.4,<2.0a0)"]
+crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"]
[[package]]
name = "scantree"
@@ -15258,7 +15259,7 @@ files = [
]
[package.extras]
-cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b0) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""]
+cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""]
[metadata]
lock-version = "2.1"
diff --git a/enterprise/server/mcp/mcp_config.py b/enterprise/server/mcp/mcp_config.py
index 8231ba51a6..7bfb1adde9 100644
--- a/enterprise/server/mcp/mcp_config.py
+++ b/enterprise/server/mcp/mcp_config.py
@@ -4,9 +4,9 @@ if TYPE_CHECKING:
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.core.config.mcp_config import (
- MCPSHTTPServerConfig,
- MCPStdioServerConfig,
OpenHandsMCPConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
from openhands.core.logger import openhands_logger as logger
@@ -24,16 +24,8 @@ class SaaSOpenHandsMCPConfig(OpenHandsMCPConfig):
@staticmethod
async def create_default_mcp_server_config(
host: str, config: 'OpenHandsConfig', user_id: str | None = None
- ) -> tuple[MCPSHTTPServerConfig | None, list[MCPStdioServerConfig]]:
- """
- Create a default MCP server configuration.
-
- Args:
- host: Host string
- config: OpenHandsConfig
- Returns:
- A tuple containing the default SSE server configuration and a list of MCP stdio server configurations
- """
+ ) -> dict[str, RemoteMCPServer | StdioMCPServer]:
+ """Return a dict of default MCP server entries for SaaS mode."""
from storage.api_key_store import ApiKeyStore
api_key_store = ApiKeyStore.get_instance()
@@ -47,9 +39,14 @@ class SaaSOpenHandsMCPConfig(OpenHandsMCPConfig):
if not api_key:
logger.error(f'Could not provision MCP API Key for user: {user_id}')
- return None, []
-
- return MCPSHTTPServerConfig(
- url=f'https://{host}/mcp/mcp', api_key=api_key
- ), []
- return None, []
+ return {}
+
+ return {
+ 'openhands': RemoteMCPServer(
+ url=f'https://{host}/mcp/mcp',
+ transport='http',
+ auth=api_key,
+ timeout=60,
+ )
+ }
+ return {}
diff --git a/enterprise/server/routes/org_models.py b/enterprise/server/routes/org_models.py
index e57c429101..dc0de1bdbf 100644
--- a/enterprise/server/routes/org_models.py
+++ b/enterprise/server/routes/org_models.py
@@ -1,4 +1,4 @@
-from typing import Annotated
+from typing import Annotated, Any
from pydantic import (
BaseModel,
@@ -12,6 +12,8 @@ from storage.org import Org
from storage.org_member import OrgMember
from storage.role import Role
+from openhands.sdk.settings import AgentSettings, ConversationSettings
+
class OrgCreationError(Exception):
"""Base exception for organization creation errors."""
@@ -144,21 +146,16 @@ class OrgResponse(BaseModel):
contact_name: str
contact_email: str
conversation_expiration: int | None = None
- agent: str | None = None
- default_max_iterations: int | None = None
- security_analyzer: str | None = None
- confirmation_mode: bool | None = None
- default_llm_model: str | None = None
- default_llm_api_key_for_byor: str | None = None
- default_llm_base_url: str | None = None
remote_runtime_resource_factor: int | None = None
- enable_default_condenser: bool = True
billing_margin: float | None = None
enable_proactive_conversation_starters: bool = True
sandbox_base_container_image: str | None = None
sandbox_runtime_container_image: str | None = None
org_version: int = 0
- mcp_config: dict | None = None
+ agent_settings: AgentSettings = Field(default_factory=AgentSettings)
+ conversation_settings: ConversationSettings = Field(
+ default_factory=ConversationSettings
+ )
search_api_key: str | None = None
sandbox_api_key: str | None = None
max_budget_per_task: float | None = None
@@ -171,33 +168,14 @@ class OrgResponse(BaseModel):
def from_org(
cls, org: Org, credits: float | None = None, user_id: str | None = None
) -> 'OrgResponse':
- """Create an OrgResponse from an Org entity.
-
- Args:
- org: The organization entity to convert
- credits: Optional credits value (defaults to None)
- user_id: Optional user ID to determine if org is personal (defaults to None)
-
- Returns:
- OrgResponse: The response model instance
- """
+ """Create an OrgResponse from an Org entity."""
return cls(
id=str(org.id),
name=org.name,
contact_name=org.contact_name,
contact_email=org.contact_email,
conversation_expiration=org.conversation_expiration,
- agent=org.agent,
- default_max_iterations=org.default_max_iterations,
- security_analyzer=org.security_analyzer,
- confirmation_mode=org.confirmation_mode,
- default_llm_model=org.default_llm_model,
- default_llm_api_key_for_byor=None,
- default_llm_base_url=org.default_llm_base_url,
remote_runtime_resource_factor=org.remote_runtime_resource_factor,
- enable_default_condenser=org.enable_default_condenser
- if org.enable_default_condenser is not None
- else True,
billing_margin=org.billing_margin,
enable_proactive_conversation_starters=org.enable_proactive_conversation_starters
if org.enable_proactive_conversation_starters is not None
@@ -205,7 +183,12 @@ class OrgResponse(BaseModel):
sandbox_base_container_image=org.sandbox_base_container_image,
sandbox_runtime_container_image=org.sandbox_runtime_container_image,
org_version=org.org_version if org.org_version is not None else 0,
- mcp_config=org.mcp_config,
+ agent_settings=AgentSettings.model_validate(
+ dict(org.agent_settings) if org.agent_settings else {}
+ ),
+ conversation_settings=ConversationSettings.model_validate(
+ dict(org.conversation_settings) if org.conversation_settings else {}
+ ),
search_api_key=None,
sandbox_api_key=None,
max_budget_per_task=org.max_budget_per_task,
@@ -227,7 +210,6 @@ class OrgPage(BaseModel):
class OrgUpdate(BaseModel):
"""Request model for updating an organization."""
- # Basic organization information (any authenticated user can update)
name: Annotated[
str | None,
StringConstraints(strip_whitespace=True, min_length=1, max_length=255),
@@ -235,7 +217,6 @@ class OrgUpdate(BaseModel):
contact_name: str | None = None
contact_email: EmailStr | None = None
conversation_expiration: int | None = None
- default_max_iterations: int | None = Field(default=None, gt=0)
remote_runtime_resource_factor: int | None = Field(default=None, gt=0)
billing_margin: float | None = Field(default=None, ge=0, le=1)
enable_proactive_conversation_starters: bool | None = None
@@ -245,31 +226,20 @@ class OrgUpdate(BaseModel):
max_budget_per_task: float | None = Field(default=None, gt=0)
enable_solvability_analysis: bool | None = None
v1_enabled: bool | None = None
-
- # LLM settings (require admin/owner role)
- default_llm_model: str | None = None
- default_llm_api_key_for_byor: str | None = None
- default_llm_base_url: str | None = None
search_api_key: str | None = None
- security_analyzer: str | None = None
- agent: str | None = None
- confirmation_mode: bool | None = None
- enable_default_condenser: bool | None = None
- condenser_max_size: int | None = Field(default=None, ge=20)
+ agent_settings_diff: dict[str, Any] | None = None
+ conversation_settings_diff: dict[str, Any] | None = None
class OrgLLMSettingsResponse(BaseModel):
- """Response model for organization LLM settings."""
+ """Response model for organization default LLM settings."""
- default_llm_model: str | None = None
- default_llm_base_url: str | None = None
+ agent_settings: AgentSettings = Field(default_factory=AgentSettings)
+ conversation_settings: ConversationSettings = Field(
+ default_factory=ConversationSettings
+ )
+ llm_api_key_set: bool = False
search_api_key: str | None = None # Masked in response
- agent: str | None = None
- confirmation_mode: bool | None = None
- security_analyzer: str | None = None
- enable_default_condenser: bool = True
- condenser_max_size: int | None = None
- default_max_iterations: int | None = None
@staticmethod
def _mask_key(secret: SecretStr | None) -> str | None:
@@ -287,83 +257,55 @@ class OrgLLMSettingsResponse(BaseModel):
def from_org(cls, org: Org) -> 'OrgLLMSettingsResponse':
"""Create response from Org entity."""
return cls(
- default_llm_model=org.default_llm_model,
- default_llm_base_url=org.default_llm_base_url,
+ agent_settings=AgentSettings.model_validate(
+ dict(org.agent_settings) if org.agent_settings else {}
+ ),
+ conversation_settings=ConversationSettings.model_validate(
+ dict(org.conversation_settings) if org.conversation_settings else {}
+ ),
+ llm_api_key_set=org.llm_api_key is not None,
search_api_key=cls._mask_key(org.search_api_key),
- agent=org.agent,
- confirmation_mode=org.confirmation_mode,
- security_analyzer=org.security_analyzer,
- enable_default_condenser=org.enable_default_condenser
- if org.enable_default_condenser is not None
- else True,
- condenser_max_size=org.condenser_max_size,
- default_max_iterations=org.default_max_iterations,
)
class OrgMemberLLMSettings(BaseModel):
- """LLM settings to propagate to organization members.
-
- Field names match OrgMember DB columns.
- """
+ """Shared LLM settings that may be propagated to organization members."""
- llm_model: str | None = None
- llm_base_url: str | None = None
- max_iterations: int | None = None
+ agent_settings_diff: dict[str, Any] | None = None
+ conversation_settings_diff: dict[str, Any] | None = None
llm_api_key: str | None = None
def has_updates(self) -> bool:
"""Check if any field is set (not None)."""
- return any(getattr(self, field) is not None for field in self.model_fields)
+ return any(
+ getattr(self, field) is not None for field in type(self).model_fields
+ )
class OrgLLMSettingsUpdate(BaseModel):
- """Request model for updating organization LLM settings.
+ """Request model for updating organization LLM settings."""
- Field names match Org DB columns exactly.
- """
-
- default_llm_model: str | None = None
- default_llm_base_url: str | None = None
+ agent_settings_diff: dict[str, Any] | None = None
+ conversation_settings_diff: dict[str, Any] | None = None
search_api_key: str | None = None
- agent: str | None = None
- confirmation_mode: bool | None = None
- security_analyzer: str | None = None
- enable_default_condenser: bool | None = None
- condenser_max_size: int | None = Field(default=None, ge=20)
- default_max_iterations: int | None = Field(default=None, gt=0)
llm_api_key: str | None = None
def has_updates(self) -> bool:
"""Check if any field is set (not None)."""
- return any(getattr(self, field) is not None for field in self.model_fields)
+ return any(
+ getattr(self, field) is not None for field in type(self).model_fields
+ )
def apply_to_org(self, org: Org) -> None:
- """Apply non-None settings to the organization model.
-
- Args:
- org: Organization entity to update in place
- """
- for field_name in self.model_fields:
- value = getattr(self, field_name)
- # Skip llm_api_key - it's only for member propagation, not org-level
- if value is not None and field_name != 'llm_api_key':
- setattr(org, field_name, value)
+ """Apply non-None settings to the organization model."""
+ if self.search_api_key is not None:
+ org.search_api_key = self.search_api_key or None
+ if self.llm_api_key is not None:
+ org.llm_api_key = self.llm_api_key or None
def get_member_updates(self) -> OrgMemberLLMSettings | None:
- """Get updates that need to be propagated to org members.
-
- Returns:
- OrgMemberLLMSettings with mapped field values, or None if no member updates needed.
- Maps: default_llm_model → llm_model, default_llm_base_url → llm_base_url,
- default_max_iterations → max_iterations, llm_api_key → llm_api_key
- """
- member_settings = OrgMemberLLMSettings(
- llm_model=self.default_llm_model,
- llm_base_url=self.default_llm_base_url,
- max_iterations=self.default_max_iterations,
- llm_api_key=self.llm_api_key,
- )
+ """Get updates that need to be propagated to org members."""
+ member_settings = OrgMemberLLMSettings(llm_api_key=self.llm_api_key)
return member_settings if member_settings.has_updates() else None
@@ -393,25 +335,28 @@ class OrgMemberUpdate(BaseModel):
class MeResponse(BaseModel):
- """Response model for the current user's membership in an organization."""
+ """Response model for the current user's membership in an organization.
+
+ ``agent_settings_diff`` and ``conversation_settings_diff`` carry the
+ member-level overrides on top of the organization defaults.
+ """
org_id: str
user_id: str
email: str
role: str
llm_api_key: str
- max_iterations: int | None = None
- llm_model: str | None = None
llm_api_key_for_byor: str | None = None
- llm_base_url: str | None = None
+ agent_settings_diff: dict[str, Any] = Field(default_factory=dict)
+ conversation_settings_diff: dict[str, Any] = Field(default_factory=dict)
status: str | None = None
@staticmethod
- def _mask_key(secret: SecretStr | None) -> str:
+ def _mask_key(secret: str | SecretStr | None) -> str:
"""Mask an API key, showing only last 4 characters."""
if secret is None:
return ''
- raw = secret.get_secret_value()
+ raw = secret.get_secret_value() if isinstance(secret, SecretStr) else secret
if not raw:
return ''
if len(raw) <= 4:
@@ -419,27 +364,22 @@ class MeResponse(BaseModel):
return '****' + raw[-4:]
@classmethod
- def from_org_member(cls, member: OrgMember, role: Role, email: str) -> 'MeResponse':
- """Create a MeResponse from an OrgMember, Role, and user email.
-
- Args:
- member: The OrgMember entity
- role: The Role entity (provides role name)
- email: The user's email address
-
- Returns:
- MeResponse with masked API keys
- """
+ def from_org_member(
+ cls,
+ member: OrgMember,
+ role: Role,
+ email: str,
+ ) -> 'MeResponse':
+ """Create a MeResponse from an OrgMember, Role, and user email."""
return cls(
org_id=str(member.org_id),
user_id=str(member.user_id),
email=email,
role=role.name,
llm_api_key=cls._mask_key(member.llm_api_key),
- max_iterations=member.max_iterations,
- llm_model=member.llm_model,
llm_api_key_for_byor=cls._mask_key(member.llm_api_key_for_byor) or None,
- llm_base_url=member.llm_base_url,
+ agent_settings_diff=dict(member.agent_settings_diff or {}),
+ conversation_settings_diff=dict(member.conversation_settings_diff or {}),
status=member.status,
)
diff --git a/enterprise/server/saas_nested_conversation_manager.py b/enterprise/server/saas_nested_conversation_manager.py
index 5c8f8aa235..1e3e26c9ac 100644
--- a/enterprise/server/saas_nested_conversation_manager.py
+++ b/enterprise/server/saas_nested_conversation_manager.py
@@ -27,7 +27,7 @@ from storage.stored_conversation_metadata_saas import StoredConversationMetadata
from openhands.controller.agent import Agent
from openhands.core.config import LLMConfig, OpenHandsConfig
-from openhands.core.config.mcp_config import MCPConfig, MCPSHTTPServerConfig
+from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
from openhands.core.logger import openhands_logger as logger
from openhands.events.action import MessageAction
from openhands.events.event_store import EventStore
@@ -497,10 +497,16 @@ class SaasNestedConversationManager(ConversationManager):
if not mcp_api_key:
return None
web_host = os.environ.get('WEB_HOST', 'app.all-hands.dev')
- shttp_servers = [
- MCPSHTTPServerConfig(url=f'https://{web_host}/mcp/mcp', api_key=mcp_api_key)
- ]
- return MCPConfig(shttp_servers=shttp_servers)
+ return MCPConfig(
+ mcpServers={
+ 'openhands': RemoteMCPServer(
+ url=f'https://{web_host}/mcp/mcp',
+ transport='http',
+ auth=mcp_api_key,
+ timeout=60,
+ )
+ }
+ )
async def _create_nested_conversation(
self,
@@ -523,9 +529,11 @@ class SaasNestedConversationManager(ConversationManager):
mcp_config = await self._get_mcp_config(user_id)
if mcp_config:
# Merge with any MCP config from settings
- if settings.mcp_config:
- mcp_config = mcp_config.merge(settings.mcp_config)
- # Check again since theoretically merge could return None.
+ sdk_mcp = settings.agent_settings.mcp_config
+ if sdk_mcp and sdk_mcp.mcpServers:
+ from openhands.core.config.mcp_config import merge_mcp_configs
+
+ mcp_config = merge_mcp_configs(mcp_config, sdk_mcp)
if mcp_config:
init_conversation['mcp_config'] = mcp_config.model_dump()
@@ -855,7 +863,7 @@ class SaasNestedConversationManager(ConversationManager):
user_id=user_id,
)
llm_registry.retry_listner = session._notify_on_llm_retry
- agent_cls = settings.agent or self.config.default_agent
+ agent_cls = settings.agent_settings.agent or self.config.default_agent
agent_config = self.config.get_agent_config(agent_cls)
agent = Agent.get_cls(agent_cls)(agent_config, llm_registry)
diff --git a/enterprise/server/services/org_invitation_service.py b/enterprise/server/services/org_invitation_service.py
index fbed399520..29fb1d1e96 100644
--- a/enterprise/server/services/org_invitation_service.py
+++ b/enterprise/server/services/org_invitation_service.py
@@ -365,15 +365,17 @@ class OrgInvitationService:
'Failed to set up organization access. Please try again.'
)
- # Step 4.5: Fetch organization to get its LLM settings
+ # Step 4.5: Ensure the organization still exists before adding membership
org = await OrgStore.get_org_by_id(invitation.org_id)
if not org:
raise InvitationInvalidError('Organization not found')
- # Step 5: Add user to organization with inherited org LLM settings
- # Get the llm_api_key as string (it's SecretStr | None in Settings)
+ # Step 5: Add user to organization. New members start with no
+ # personal agent-setting overrides so future org default changes
+ # continue to flow through automatically.
+ llm_api_key_secret = settings.agent_settings.llm.api_key
llm_api_key = (
- settings.llm_api_key.get_secret_value() if settings.llm_api_key else ''
+ llm_api_key_secret.get_secret_value() if llm_api_key_secret else ''
)
await OrgMemberStore.add_user_to_org(
@@ -382,9 +384,8 @@ class OrgInvitationService:
role_id=invitation.role_id,
llm_api_key=llm_api_key,
status='active',
- llm_model=org.default_llm_model,
- llm_base_url=org.default_llm_base_url,
- max_iterations=org.default_max_iterations,
+ agent_settings_diff={},
+ conversation_settings_diff={},
)
# Step 6: Mark invitation as accepted
diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.py
index 2b378faa11..52dfacd825 100644
--- a/enterprise/storage/lite_llm_manager.py
+++ b/enterprise/storage/lite_llm_manager.py
@@ -17,7 +17,6 @@ from server.constants import (
get_default_litellm_model,
)
from server.logger import logger
-from storage.encrypt_utils import decrypt_legacy_value
from storage.user_settings import UserSettings
from openhands.server.settings import Settings
@@ -216,11 +215,18 @@ class LiteLlmManager:
None,
)
- oss_settings.agent = 'CodeActAgent'
- # Use the model corresponding to the current user settings version
- oss_settings.llm_model = get_default_litellm_model()
- oss_settings.llm_api_key = SecretStr(key)
- oss_settings.llm_base_url = LITE_LLM_API_URL
+ oss_settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': get_default_litellm_model(),
+ 'api_key': key,
+ 'base_url': LITE_LLM_API_URL,
+ },
+ }
+ }
+ )
return oss_settings
@staticmethod
@@ -354,12 +360,16 @@ class LiteLlmManager:
# Check if the database key exists in LiteLLM
# If not, generate a new key to prevent verification failures later
db_key = None
- if (
- user_settings
- and user_settings.llm_api_key
- and user_settings.llm_base_url == LITE_LLM_API_URL
- ):
- db_key = user_settings.llm_api_key
+ llm_base_url = None
+ # agent_settings is a JSON column (dict) on UserSettings
+ llm_cfg = (
+ (user_settings.agent_settings or {}).get('llm', {})
+ if user_settings
+ else {}
+ )
+ llm_base_url = llm_cfg.get('base_url')
+ if llm_base_url == LITE_LLM_API_URL:
+ db_key = llm_cfg.get('api_key')
if hasattr(db_key, 'get_secret_value'):
db_key = db_key.get_secret_value()
@@ -392,8 +402,13 @@ class LiteLlmManager:
extra={'org_id': org_id, 'user_id': keycloak_user_id},
)
# Update user_settings with the new key so it gets stored in org_member
- user_settings.llm_api_key = SecretStr(new_key)
- user_settings.llm_api_key_for_byor = SecretStr(new_key)
+ # agent_settings is a JSON column (dict) on UserSettings
+ if user_settings.agent_settings is None:
+ user_settings.agent_settings = {}
+ user_settings.agent_settings.setdefault('llm', {})[
+ 'api_key'
+ ] = new_key
+ user_settings.llm_api_key_for_byor_secret = SecretStr(new_key)
logger.info(
'LiteLlmManager:migrate_lite_llm_entries:complete',
@@ -861,13 +876,6 @@ class LiteLlmManager:
logger.warning('LiteLLM API configuration not found')
return
- try:
- # Sometimes the key we get is encrypted - attempt to decrypt.
- key = decrypt_legacy_value(key)
- except Exception:
- # The key was not encrypted
- pass
-
payload = {
'key': key,
}
diff --git a/enterprise/storage/org.py b/enterprise/storage/org.py
index 8f4f6ba2c5..f223768ba4 100644
--- a/enterprise/storage/org.py
+++ b/enterprise/storage/org.py
@@ -21,14 +21,7 @@ class Org(Base): # type: ignore
name = Column(String, nullable=False, unique=True)
contact_name = Column(String, nullable=True)
contact_email = Column(String, nullable=True)
- agent = Column(String, nullable=True)
- default_max_iterations = Column(Integer, nullable=True)
- security_analyzer = Column(String, nullable=True)
- confirmation_mode = Column(Boolean, nullable=True, default=False)
- default_llm_model = Column(String, nullable=True)
- default_llm_base_url = Column(String, nullable=True)
remote_runtime_resource_factor = Column(Integer, nullable=True)
- enable_default_condenser = Column(Boolean, nullable=False, default=True)
billing_margin = Column(Float, nullable=True, default=DEFAULT_BILLING_MARGIN)
enable_proactive_conversation_starters = Column(
Boolean, nullable=False, default=True
@@ -36,7 +29,10 @@ class Org(Base): # type: ignore
sandbox_base_container_image = Column(String, nullable=True)
sandbox_runtime_container_image = Column(String, nullable=True)
org_version = Column(Integer, nullable=False, default=0)
- mcp_config = Column(JSON, nullable=True)
+ agent_settings = Column(JSON, nullable=False, default=dict)
+ conversation_settings = Column(JSON, nullable=False, default=dict)
+ # encrypted column, don't set directly, set without the underscore
+ _llm_api_key = Column(String, nullable=True)
# encrypted column, don't set directly, set without the underscore
_search_api_key = Column(String, nullable=True)
# encrypted column, don't set directly, set without the underscore
@@ -45,7 +41,6 @@ class Org(Base): # type: ignore
enable_solvability_analysis = Column(Boolean, nullable=True, default=False)
v1_enabled = Column(Boolean, nullable=True)
conversation_expiration = Column(Integer, nullable=True)
- condenser_max_size = Column(Integer, nullable=True)
byor_export_enabled = Column(Boolean, nullable=False, default=False)
sandbox_grouping_strategy = Column(String, nullable=True)
@@ -67,12 +62,21 @@ class Org(Base): # type: ignore
git_claims = relationship('OrgGitClaim', back_populates='org')
def __init__(self, **kwargs):
+ # Serialize Pydantic model objects to dicts for JSON columns.
+ from pydantic import BaseModel
+
+ for key in ('agent_settings', 'conversation_settings'):
+ if key in kwargs and isinstance(kwargs[key], BaseModel):
+ kwargs[key] = kwargs[key].model_dump(mode='json')
+
# Handle known SQLAlchemy columns directly
for key in list(kwargs):
if hasattr(self.__class__, key):
setattr(self, key, kwargs.pop(key))
# Handle custom property-style fields
+ if 'llm_api_key' in kwargs:
+ self.llm_api_key = kwargs.pop('llm_api_key')
if 'search_api_key' in kwargs:
self.search_api_key = kwargs.pop('search_api_key')
if 'sandbox_api_key' in kwargs:
@@ -81,6 +85,18 @@ class Org(Base): # type: ignore
if kwargs:
raise TypeError(f'Unexpected keyword arguments: {list(kwargs.keys())}')
+ @property
+ def llm_api_key(self) -> SecretStr | None:
+ if self._llm_api_key:
+ decrypted = decrypt_value(self._llm_api_key)
+ return SecretStr(decrypted)
+ return None
+
+ @llm_api_key.setter
+ def llm_api_key(self, value: str | SecretStr | None):
+ raw = value.get_secret_value() if isinstance(value, SecretStr) else value
+ self._llm_api_key = encrypt_value(raw) if raw else None
+
@property
def search_api_key(self) -> SecretStr | None:
if self._search_api_key:
diff --git a/enterprise/storage/org_app_settings_store.py b/enterprise/storage/org_app_settings_store.py
index 9812265958..9cc185672c 100644
--- a/enterprise/storage/org_app_settings_store.py
+++ b/enterprise/storage/org_app_settings_store.py
@@ -16,6 +16,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
from storage.org import Org
from storage.user import User
+from openhands.utils.jsonpatch_compat import deep_merge
+
@dataclass
class OrgAppSettingsStore:
@@ -65,8 +67,15 @@ class OrgAppSettingsStore:
"""
if org.org_version < ORG_SETTINGS_VERSION:
org.org_version = ORG_SETTINGS_VERSION
- org.default_llm_model = get_default_litellm_model()
- org.llm_base_url = LITE_LLM_API_URL
+ org.agent_settings = deep_merge(
+ org.agent_settings,
+ {
+ 'llm': {
+ 'model': get_default_litellm_model(),
+ 'base_url': LITE_LLM_API_URL,
+ },
+ },
+ )
await self.db_session.flush()
await self.db_session.refresh(org)
diff --git a/enterprise/storage/org_llm_settings_store.py b/enterprise/storage/org_llm_settings_store.py
index ad901b4ad6..6eebee7b5a 100644
--- a/enterprise/storage/org_llm_settings_store.py
+++ b/enterprise/storage/org_llm_settings_store.py
@@ -10,9 +10,10 @@ from server.routes.org_models import OrgLLMSettingsUpdate
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from storage.org import Org
-from storage.org_member_store import OrgMemberStore
from storage.user import User
+from openhands.utils.jsonpatch_compat import deep_merge
+
@dataclass
class OrgLLMSettingsStore:
@@ -49,7 +50,6 @@ class OrgLLMSettingsStore:
) -> Org | None:
"""Update organization LLM settings.
- Also propagates relevant settings to all org members.
Uses flush() - commit happens at request end via DbSessionInjector.
Args:
@@ -67,14 +67,16 @@ class OrgLLMSettingsStore:
if not org:
return None
- # Apply updates to org (excludes llm_api_key which is member-only)
update_data.apply_to_org(org)
-
- # Propagate relevant settings to all org members
- member_updates = update_data.get_member_updates()
- if member_updates:
- await OrgMemberStore.update_all_members_llm_settings_async(
- self.db_session, org_id, member_updates
+ if update_data.agent_settings_diff:
+ org.agent_settings = deep_merge(
+ org.agent_settings,
+ update_data.agent_settings_diff,
+ )
+ if update_data.conversation_settings_diff:
+ org.conversation_settings = deep_merge(
+ org.conversation_settings,
+ update_data.conversation_settings_diff,
)
# flush instead of commit - DbSessionInjector auto-commits at request end
diff --git a/enterprise/storage/org_member.py b/enterprise/storage/org_member.py
index 3842b76520..9eccb1198a 100644
--- a/enterprise/storage/org_member.py
+++ b/enterprise/storage/org_member.py
@@ -3,7 +3,7 @@ SQLAlchemy model for Organization-Member relationship.
"""
from pydantic import SecretStr
-from sqlalchemy import JSON, UUID, Column, ForeignKey, Integer, String
+from sqlalchemy import JSON, UUID, Boolean, Column, ForeignKey, Integer, String
from sqlalchemy.orm import relationship
from storage.base import Base
from storage.encrypt_utils import decrypt_value, encrypt_value
@@ -18,12 +18,11 @@ class OrgMember(Base): # type: ignore
user_id = Column(UUID(as_uuid=True), ForeignKey('user.id'), primary_key=True)
role_id = Column(Integer, ForeignKey('role.id'), nullable=False)
_llm_api_key = Column(String, nullable=False)
- max_iterations = Column(Integer, nullable=True)
- llm_model = Column(String, nullable=True)
_llm_api_key_for_byor = Column(String, nullable=True)
- llm_base_url = Column(String, nullable=True)
+ has_custom_llm_api_key = Column(Boolean, nullable=False, default=False)
+ agent_settings_diff = Column(JSON, nullable=False, default=dict)
+ conversation_settings_diff = Column(JSON, nullable=False, default=dict)
status = Column(String, nullable=True)
- mcp_config = Column(JSON, nullable=True)
# Relationships
org = relationship('Org', back_populates='org_members')
diff --git a/enterprise/storage/org_member_store.py b/enterprise/storage/org_member_store.py
index bc4c5878cd..d3a8980d86 100644
--- a/enterprise/storage/org_member_store.py
+++ b/enterprise/storage/org_member_store.py
@@ -2,20 +2,20 @@
Store class for managing organization-member relationships.
"""
-from typing import Optional
+from typing import Any, Optional
from uuid import UUID
from server.routes.org_models import OrgMemberLLMSettings
-from sqlalchemy import func, select, update
+from sqlalchemy import func, select
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import joinedload
from storage.database import a_session_maker
-from storage.encrypt_utils import encrypt_value
from storage.org_member import OrgMember
from storage.user import User
from storage.user_settings import UserSettings
from openhands.storage.data_models.settings import Settings
+from openhands.utils.jsonpatch_compat import deep_merge
class OrgMemberStore:
@@ -28,9 +28,8 @@ class OrgMemberStore:
role_id: int,
llm_api_key: str,
status: Optional[str] = None,
- llm_model: Optional[str] = None,
- llm_base_url: Optional[str] = None,
- max_iterations: Optional[int] = None,
+ agent_settings_diff: Optional[dict[str, Any]] = None,
+ conversation_settings_diff: Optional[dict[str, Any]] = None,
) -> OrgMember:
"""Add a user to an organization with a specific role."""
async with a_session_maker() as session:
@@ -40,9 +39,8 @@ class OrgMemberStore:
role_id=role_id,
llm_api_key=llm_api_key,
status=status,
- llm_model=llm_model,
- llm_base_url=llm_base_url,
- max_iterations=max_iterations,
+ agent_settings_diff=dict(agent_settings_diff or {}),
+ conversation_settings_diff=dict(conversation_settings_diff or {}),
)
session.add(org_member)
await session.commit()
@@ -149,22 +147,22 @@ class OrgMemberStore:
return True
@staticmethod
- def get_kwargs_from_settings(settings: Settings):
- kwargs = {
- normalized: getattr(settings, normalized)
- for c in OrgMember.__table__.columns
- if (normalized := c.name.lstrip('_')) and hasattr(settings, normalized)
+ def get_kwargs_from_settings(settings: Settings) -> dict[str, Any]:
+ """Return kwargs for OrgMember construction (keys match column names)."""
+ return {
+ 'llm_api_key': settings.agent_settings.llm.api_key,
+ 'agent_settings_diff': {},
+ 'conversation_settings_diff': {},
}
- return kwargs
@staticmethod
- def get_kwargs_from_user_settings(user_settings: UserSettings):
- kwargs = {
- normalized: getattr(user_settings, normalized)
- for c in OrgMember.__table__.columns
- if (normalized := c.name.lstrip('_')) and hasattr(user_settings, normalized)
+ def get_kwargs_from_user_settings(user_settings: UserSettings) -> dict[str, Any]:
+ """Return kwargs for OrgMember construction (keys match column names)."""
+ return {
+ 'llm_api_key': user_settings.llm_api_key,
+ 'agent_settings_diff': dict(user_settings.agent_settings),
+ 'conversation_settings_diff': dict(user_settings.conversation_settings),
}
- return kwargs
@staticmethod
async def get_org_members_count(
@@ -244,21 +242,41 @@ class OrgMemberStore:
org_id: UUID,
member_settings: OrgMemberLLMSettings,
) -> None:
- """Update LLM settings for all members of an organization.
+ """Update shared LLM settings for all members of an organization.
Args:
session: Database session (passed from caller for transaction)
org_id: Organization ID
- member_settings: Typed LLM settings to apply to all members
+ member_settings: Shared settings to apply to all members
"""
- # Build update values from non-None fields
values = member_settings.model_dump(exclude_none=True)
+ if not values:
+ return
+
+ result = await session.execute(
+ select(OrgMember).where(OrgMember.org_id == org_id)
+ )
+ org_members = list(result.scalars().all())
+
+ raw_key = values.pop('llm_api_key', None)
+ agent_settings_diff = values.pop('agent_settings_diff', None)
+ conversation_settings_diff = values.pop('conversation_settings_diff', None)
+
+ for org_member in org_members:
+ if raw_key is not None:
+ org_member.llm_api_key = raw_key
+
+ if agent_settings_diff is not None:
+ org_member.agent_settings_diff = deep_merge(
+ org_member.agent_settings_diff,
+ agent_settings_diff,
+ )
- # Handle encrypted llm_api_key field - map to _llm_api_key column with encryption
- if 'llm_api_key' in values:
- raw_key = values.pop('llm_api_key')
- values['_llm_api_key'] = encrypt_value(raw_key)
+ if conversation_settings_diff is not None:
+ org_member.conversation_settings_diff = deep_merge(
+ org_member.conversation_settings_diff,
+ conversation_settings_diff,
+ )
- if values:
- stmt = update(OrgMember).where(OrgMember.org_id == org_id).values(**values)
- await session.execute(stmt)
+ for key, value in values.items():
+ setattr(org_member, key, value)
diff --git a/enterprise/storage/org_service.py b/enterprise/storage/org_service.py
index 1f5b26a2d4..80a941bb73 100644
--- a/enterprise/storage/org_service.py
+++ b/enterprise/storage/org_service.py
@@ -25,6 +25,7 @@ from storage.role_store import RoleStore
from storage.user_store import UserStore
from openhands.core.logger import openhands_logger as logger
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.storage.data_models.settings import Settings
@@ -107,13 +108,16 @@ class OrgService:
Returns:
Org: New organization entity (not yet persisted)
"""
+ default_agent_settings = AgentSettings()
+ default_agent_settings.llm.model = get_default_litellm_model()
return Org(
id=org_id,
name=name,
contact_name=contact_name,
contact_email=contact_email,
org_version=ORG_SETTINGS_VERSION,
- default_llm_model=get_default_litellm_model(),
+ agent_settings=default_agent_settings,
+ conversation_settings=ConversationSettings(),
)
@staticmethod
@@ -467,42 +471,6 @@ class OrgService:
)
return False
- @staticmethod
- def _get_llm_settings_fields() -> set[str]:
- """
- Get the set of organization fields that are considered LLM settings
- and require admin/owner role to update.
-
- Returns:
- set[str]: Set of field names that require elevated permissions
- """
- return {
- 'default_llm_model',
- 'default_llm_api_key_for_byor',
- 'default_llm_base_url',
- 'search_api_key',
- 'security_analyzer',
- 'agent',
- 'confirmation_mode',
- 'enable_default_condenser',
- 'condenser_max_size',
- }
-
- @staticmethod
- def _has_llm_settings_updates(update_data: OrgUpdate) -> set[str]:
- """
- Check if the update contains any LLM settings fields.
-
- Args:
- update_data: The organization update data
-
- Returns:
- set[str]: Set of LLM fields being updated (empty if none)
- """
- llm_fields = OrgService._get_llm_settings_fields()
- update_dict = update_data.model_dump(exclude_none=True)
- return llm_fields.intersection(update_dict.keys())
-
@staticmethod
async def update_org_with_permissions(
org_id: UUID,
@@ -571,33 +539,6 @@ class OrgService:
)
raise OrgNameExistsError(update_data.name)
- # Check if update contains any LLM settings
- llm_fields_being_updated = OrgService._has_llm_settings_updates(update_data)
- if llm_fields_being_updated:
- # Verify user has admin or owner role
- has_permission = await OrgService.has_admin_or_owner_role(user_id, org_id)
- if not has_permission:
- logger.warning(
- 'User attempted to update LLM settings without permission',
- extra={
- 'user_id': user_id,
- 'org_id': str(org_id),
- 'attempted_fields': list(llm_fields_being_updated),
- },
- )
- raise PermissionError(
- 'Admin or owner role required to update LLM settings'
- )
-
- logger.debug(
- 'User has permission to update LLM settings',
- extra={
- 'user_id': user_id,
- 'org_id': str(org_id),
- 'llm_fields': list(llm_fields_being_updated),
- },
- )
-
# Convert to dict for OrgStore (excluding None values)
update_dict = update_data.model_dump(exclude_none=True)
if not update_dict:
@@ -607,6 +548,29 @@ class OrgService:
)
return existing_org
+ restricted_fields = {
+ 'agent_settings_diff',
+ 'conversation_settings_diff',
+ 'search_api_key',
+ 'sandbox_api_key',
+ }
+ if restricted_fields.intersection(
+ update_dict
+ ) and not await OrgService.has_admin_or_owner_role(user_id, org_id):
+ logger.warning(
+ 'Insufficient role for restricted organization settings update',
+ extra={
+ 'user_id': user_id,
+ 'org_id': str(org_id),
+ 'restricted_fields': sorted(
+ restricted_fields.intersection(update_dict)
+ ),
+ },
+ )
+ raise PermissionError(
+ 'Admin or owner role required to update organization agent settings'
+ )
+
# Perform the update
try:
updated_org = await OrgStore.update_org(org_id, update_dict)
diff --git a/enterprise/storage/org_store.py b/enterprise/storage/org_store.py
index 23015ea5be..1f52e38ea7 100644
--- a/enterprise/storage/org_store.py
+++ b/enterprise/storage/org_store.py
@@ -22,12 +22,44 @@ from storage.user import User
from storage.user_settings import UserSettings
from openhands.core.logger import openhands_logger as logger
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.storage.data_models.settings import Settings
+from openhands.utils.jsonpatch_compat import deep_merge
+
+_ORG_SETTINGS_EXCLUDED_FIELDS = {
+ 'id',
+ 'name',
+ 'contact_name',
+ 'contact_email',
+ 'org_version',
+ 'llm_api_key',
+}
+_ORG_SETTINGS_FIELDS = {
+ normalized
+ for column in Org.__table__.columns
+ if (normalized := column.name.lstrip('_')) not in _ORG_SETTINGS_EXCLUDED_FIELDS
+}
class OrgStore:
"""Store for managing organizations."""
+ @staticmethod
+ def get_agent_settings_from_org(org: Org) -> AgentSettings:
+ return AgentSettings.model_validate(dict(org.agent_settings))
+
+ @staticmethod
+ def get_conversation_settings_from_org(org: Org) -> ConversationSettings:
+ return ConversationSettings.model_validate(dict(org.conversation_settings))
+
+ @staticmethod
+ def sync_agent_settings(org: Org) -> None:
+ org.agent_settings = dict(org.agent_settings)
+
+ @staticmethod
+ def sync_conversation_settings(org: Org) -> None:
+ org.conversation_settings = dict(org.conversation_settings)
+
@staticmethod
async def create_org(
kwargs: dict,
@@ -36,7 +68,16 @@ class OrgStore:
async with a_session_maker() as session:
org = Org(**kwargs)
org.org_version = ORG_SETTINGS_VERSION
- org.default_llm_model = get_default_litellm_model()
+ agent_settings = org.agent_settings or {}
+ org.agent_settings = deep_merge(
+ agent_settings,
+ {
+ 'llm': {
+ 'model': agent_settings.get('llm', {}).get('model')
+ or get_default_litellm_model()
+ }
+ },
+ )
if org.v1_enabled is None:
org.v1_enabled = DEFAULT_V1_ENABLED
session.add(org)
@@ -92,8 +133,12 @@ class OrgStore:
org.id,
{
'org_version': ORG_SETTINGS_VERSION,
- 'default_llm_model': get_default_litellm_model(),
- 'llm_base_url': LITE_LLM_API_URL,
+ 'agent_settings_diff': {
+ 'llm': {
+ 'model': get_default_litellm_model(),
+ 'base_url': LITE_LLM_API_URL,
+ },
+ },
},
)
return org
@@ -180,56 +225,43 @@ class OrgStore:
if 'id' in kwargs:
kwargs.pop('id')
+
+ agent_settings_diff = kwargs.pop('agent_settings_diff', None)
+ conversation_settings_diff = kwargs.pop('conversation_settings_diff', None)
for key, value in kwargs.items():
if hasattr(org, key):
setattr(org, key, value)
+ if agent_settings_diff is not None:
+ org.agent_settings = deep_merge(
+ org.agent_settings,
+ agent_settings_diff,
+ )
+
+ if conversation_settings_diff is not None:
+ org.conversation_settings = deep_merge(
+ org.conversation_settings,
+ conversation_settings_diff,
+ )
+
await session.commit()
await session.refresh(org)
return org
@staticmethod
def get_kwargs_from_settings(settings: Settings):
- kwargs = {}
-
- for c in Org.__table__.columns:
- # Normalize for lookup
- normalized = (
- c.name.removeprefix('_default_').removeprefix('default_').lstrip('_')
- )
-
- if not hasattr(settings, normalized):
- continue
-
- # ---- FIX: Output key should drop *only* leading "_" but preserve "default" ----
- key = c.name
- if key.startswith('_'):
- key = key[1:] # remove only the very first leading underscore
-
- kwargs[key] = getattr(settings, normalized)
-
- return kwargs
+ dumped = settings.model_dump(mode='json', context={'expose_secrets': True})
+ return {
+ field: dumped[field] for field in _ORG_SETTINGS_FIELDS if field in dumped
+ }
@staticmethod
def get_kwargs_from_user_settings(user_settings: UserSettings):
- kwargs = {}
-
- for c in Org.__table__.columns:
- # Normalize for lookup
- normalized = (
- c.name.removeprefix('_default_').removeprefix('default_').lstrip('_')
- )
-
- if not hasattr(user_settings, normalized):
- continue
-
- # ---- FIX: Output key should drop *only* leading "_" but preserve "default" ----
- key = c.name
- if key.startswith('_'):
- key = key[1:] # remove only the very first leading underscore
-
- kwargs[key] = getattr(user_settings, normalized)
-
+ kwargs = {
+ field: getattr(user_settings, field)
+ for field in _ORG_SETTINGS_FIELDS
+ if hasattr(user_settings, field)
+ }
kwargs['org_version'] = user_settings.user_version
return kwargs
@@ -431,8 +463,17 @@ class OrgStore:
if not org:
return None
- # Apply updates to org
llm_settings.apply_to_org(org)
+ if llm_settings.agent_settings_diff is not None:
+ org.agent_settings = deep_merge(
+ org.agent_settings,
+ llm_settings.agent_settings_diff,
+ )
+ if llm_settings.conversation_settings_diff is not None:
+ org.conversation_settings = deep_merge(
+ org.conversation_settings,
+ llm_settings.conversation_settings_diff,
+ )
# Propagate relevant settings to all org members
member_updates = llm_settings.get_member_updates()
diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.py
index fe949ba6c7..a29d53b7f6 100644
--- a/enterprise/storage/saas_settings_store.py
+++ b/enterprise/storage/saas_settings_store.py
@@ -1,23 +1,21 @@
from __future__ import annotations
-import binascii
-import hashlib
import uuid
-from base64 import b64decode, b64encode
from dataclasses import dataclass
+from typing import Any
-from cryptography.fernet import Fernet
from pydantic import SecretStr
from server.auth.token_manager import TokenManager
from server.constants import LITE_LLM_API_URL
from server.logger import logger
-from sqlalchemy import select, update
+from server.routes.org_models import OrgMemberLLMSettings
+from sqlalchemy import select
from sqlalchemy.orm import joinedload
from storage.database import a_session_maker
-from storage.encrypt_utils import encrypt_value
from storage.lite_llm_manager import LiteLlmManager, get_openhands_cloud_key_alias
from storage.org import Org
from storage.org_member import OrgMember
+from storage.org_member_store import OrgMemberStore
from storage.org_store import OrgStore
from storage.user import User
from storage.user_settings import UserSettings
@@ -26,6 +24,7 @@ from storage.user_store import UserStore
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.server.settings import Settings
from openhands.storage.settings.settings_store import SettingsStore
+from openhands.utils.jsonpatch_compat import deep_merge
from openhands.utils.llm import is_openhands_model
@@ -33,7 +32,6 @@ from openhands.utils.llm import is_openhands_model
class SaasSettingsStore(SettingsStore):
user_id: str
config: OpenHandsConfig
- ENCRYPT_VALUES = ['llm_api_key', 'llm_api_key_for_byor', 'search_api_key']
async def _get_user_settings_by_keycloak_id_async(
self, keycloak_user_id: str, session=None
@@ -69,6 +67,19 @@ class SaasSettingsStore(SettingsStore):
)
return result.scalars().first()
+ @staticmethod
+ def _get_effective_llm_api_key(
+ org: Org,
+ org_member: OrgMember,
+ ) -> SecretStr | None:
+ if org_member.has_custom_llm_api_key:
+ return org_member.llm_api_key
+ return org.llm_api_key or org_member.llm_api_key
+
+ @staticmethod
+ def _get_persisted_agent_settings(item: Settings) -> dict[str, Any]:
+ return item.agent_settings.model_dump(mode='json')
+
async def load(self) -> Settings | None:
user = await UserStore.get_user_by_id(self.user_id)
if not user:
@@ -81,7 +92,7 @@ class SaasSettingsStore(SettingsStore):
if om.org_id == org_id:
org_member = om
break
- if not org_member or not org_member.llm_api_key:
+ if not org_member:
return None
org = await OrgStore.get_org_by_id_async(org_id)
if not org:
@@ -89,6 +100,9 @@ class SaasSettingsStore(SettingsStore):
f'Org not found for ID {org_id} as the current org for user {self.user_id}'
)
return None
+ org_agent_settings = OrgStore.get_agent_settings_from_org(org)
+ member_agent_settings_diff = dict(org_member.agent_settings_diff)
+
kwargs = {
**{
normalized: getattr(org, c.name)
@@ -106,26 +120,36 @@ class SaasSettingsStore(SettingsStore):
if (normalized := c.name.lstrip('_')) in Settings.model_fields
},
}
- kwargs['llm_api_key'] = org_member.llm_api_key
- if org_member.max_iterations:
- kwargs['max_iterations'] = org_member.max_iterations
- if org_member.llm_model:
- kwargs['llm_model'] = org_member.llm_model
- if org_member.llm_api_key_for_byor:
- kwargs['llm_api_key_for_byor'] = org_member.llm_api_key_for_byor
- if org_member.llm_base_url:
- kwargs['llm_base_url'] = org_member.llm_base_url
- # MCP config is user-specific (stored on org_member, not org)
- if org_member.mcp_config is not None:
- kwargs['mcp_config'] = org_member.mcp_config
+ merged_agent_settings = deep_merge(
+ org_agent_settings.model_dump(mode='json'),
+ member_agent_settings_diff,
+ )
+ effective_llm_api_key = self._get_effective_llm_api_key(org, org_member)
+ if effective_llm_api_key is not None:
+ merged_agent_settings.setdefault('llm', {})['api_key'] = (
+ effective_llm_api_key.get_secret_value()
+ if isinstance(effective_llm_api_key, SecretStr)
+ else effective_llm_api_key
+ )
+ else:
+ logger.warning(
+ f'No effective LLM API key found for user {self.user_id} '
+ f'in org {org_id} (org key and member key are both unset)'
+ )
+ kwargs['agent_settings'] = merged_agent_settings
+ org_conversation = OrgStore.get_conversation_settings_from_org(org)
+ member_conversation_diff = dict(org_member.conversation_settings_diff)
+ kwargs['conversation_settings'] = deep_merge(
+ org_conversation.model_dump(mode='json'),
+ member_conversation_diff,
+ )
if org.v1_enabled is None:
kwargs['v1_enabled'] = True
# Apply default if sandbox_grouping_strategy is None in the database
if kwargs.get('sandbox_grouping_strategy') is None:
kwargs.pop('sandbox_grouping_strategy', None)
- settings = Settings(**kwargs)
- return settings
+ return Settings(**kwargs)
async def store(self, item: Settings):
async with a_session_maker() as session:
@@ -170,7 +194,7 @@ class SaasSettingsStore(SettingsStore):
if om.org_id == org_id:
org_member = om
break
- if not org_member or not org_member.llm_api_key:
+ if not org_member:
return None
result = await session.execute(select(Org).filter(Org.id == org_id))
@@ -181,62 +205,88 @@ class SaasSettingsStore(SettingsStore):
)
return None
- # Check if we need to generate an LLM key.
- # Only generate/verify proxy keys when the base URL is explicitly the
- # LiteLLM proxy, or when it's unset and the model is an OpenHands model
- # (which always needs a proxy key). For non-OpenHands models with no
- # base URL (e.g. basic view BYOR), preserve the user's own API key.
- if item.llm_base_url == LITE_LLM_API_URL or (
- not item.llm_base_url and is_openhands_model(item.llm_model)
- ):
+ llm_model = item.agent_settings.llm.model
+ llm_base_url = item.agent_settings.llm.base_url
+ normalized_llm_base_url = llm_base_url.rstrip('/') if llm_base_url else None
+ normalized_managed_base_url = LITE_LLM_API_URL.rstrip('/')
+ uses_managed_llm_key = (
+ normalized_llm_base_url == normalized_managed_base_url
+ or (normalized_llm_base_url is None and is_openhands_model(llm_model))
+ )
+
+ if uses_managed_llm_key:
await self._ensure_api_key(
- item, str(org_id), openhands_type=is_openhands_model(item.llm_model)
+ item, str(org_id), openhands_type=is_openhands_model(llm_model)
)
+ effective_agent_settings_diff = self._get_persisted_agent_settings(item)
+ org.agent_settings = deep_merge(
+ OrgStore.get_agent_settings_from_org(org).model_dump(mode='json'),
+ effective_agent_settings_diff,
+ )
+
+ effective_conversation_diff = item.conversation_settings.model_dump(
+ mode='json'
+ )
+ org.conversation_settings = deep_merge(
+ OrgStore.get_conversation_settings_from_org(org).model_dump(
+ mode='json'
+ ),
+ effective_conversation_diff,
+ )
+
kwargs = item.model_dump(context={'expose_secrets': True})
- for model in (user, org, org_member):
- for key, value in kwargs.items():
- # Skip mcp_config for org - it should only be stored on org_member (user-specific)
- if key == 'mcp_config' and model is org:
- continue
- if hasattr(model, key):
- setattr(model, key, value)
-
- # Map Settings fields to Org fields with 'default_' prefix
- # The generic loop above doesn't update these because Org uses
- # 'default_llm_model' not 'llm_model', etc.
- # Use exclude_unset to only update explicitly-set fields (allows clearing with null)
- settings_data = item.model_dump(exclude_unset=True)
- if 'llm_model' in settings_data:
- org.default_llm_model = settings_data['llm_model']
- if 'llm_base_url' in settings_data:
- org.default_llm_base_url = settings_data['llm_base_url']
- if 'max_iterations' in settings_data:
- org.default_max_iterations = settings_data['max_iterations']
-
- # Propagate LLM settings to all org members
- # This ensures all members see the same LLM configuration when an admin saves
- # Note: Concurrent saves by multiple admins will result in last-write-wins.
- # Consider adding optimistic locking if this becomes a problem.
- member_update_values: dict = {}
- if item.llm_model is not None:
- member_update_values['llm_model'] = item.llm_model
- if item.llm_base_url is not None:
- member_update_values['llm_base_url'] = item.llm_base_url
- if item.max_iterations is not None:
- member_update_values['max_iterations'] = item.max_iterations
- if item.llm_api_key is not None:
- member_update_values['_llm_api_key'] = encrypt_value(
- item.llm_api_key.get_secret_value()
- )
+ kwargs.pop('agent_settings', None)
+ kwargs.pop('conversation_settings', None)
+
+ for key, value in kwargs.items():
+ if hasattr(user, key):
+ setattr(user, key, value)
+ if hasattr(org, key) and key not in {
+ 'llm_api_key',
+ 'agent_settings',
+ 'conversation_settings',
+ }:
+ setattr(org, key, value)
+
+ current_member_llm_api_key = item.agent_settings.llm.api_key
+ org_default_llm_api_key = org.llm_api_key
+ org_default_llm_api_key_raw = (
+ org_default_llm_api_key.get_secret_value()
+ if org_default_llm_api_key
+ else None
+ )
+ current_member_llm_api_key_raw = (
+ current_member_llm_api_key.get_secret_value()
+ if current_member_llm_api_key
+ else None
+ )
- if member_update_values:
- stmt = (
- update(OrgMember)
- .where(OrgMember.org_id == org_id)
- .values(**member_update_values)
- )
- await session.execute(stmt)
+ await OrgMemberStore.update_all_members_llm_settings_async(
+ session,
+ org_id,
+ OrgMemberLLMSettings(
+ agent_settings_diff=effective_agent_settings_diff,
+ conversation_settings_diff=effective_conversation_diff,
+ llm_api_key=(
+ current_member_llm_api_key_raw
+ if not uses_managed_llm_key
+ else None
+ ),
+ ),
+ )
+
+ if uses_managed_llm_key and current_member_llm_api_key is not None:
+ # Managed/proxy key — store on this member but mark as org-managed
+ org_member.llm_api_key = current_member_llm_api_key
+ org_member.has_custom_llm_api_key = False
+ elif current_member_llm_api_key_raw is not None:
+ # BYOR: member supplied their own (non-managed) API key
+ org_member.llm_api_key = current_member_llm_api_key
+ org_member.has_custom_llm_api_key = True
+ elif org_default_llm_api_key_raw is not None:
+ # No member key, falling back to org default
+ org_member.has_custom_llm_api_key = False
await session.commit()
@@ -249,52 +299,6 @@ class SaasSettingsStore(SettingsStore):
logger.debug(f'saas_settings_store.get_instance::{user_id}')
return SaasSettingsStore(user_id, config)
- def _should_encrypt(self, key):
- return key in self.ENCRYPT_VALUES
-
- def _decrypt_kwargs(self, kwargs: dict):
- fernet = self._fernet()
- for key, value in kwargs.items():
- try:
- if value is None:
- continue
- if self._should_encrypt(key):
- if isinstance(value, SecretStr):
- value = fernet.decrypt(
- b64decode(value.get_secret_value().encode())
- ).decode()
- else:
- value = fernet.decrypt(b64decode(value.encode())).decode()
- kwargs[key] = value
- except binascii.Error:
- pass # Key is in legacy format...
-
- def _encrypt_kwargs(self, kwargs: dict):
- fernet = self._fernet()
- for key, value in kwargs.items():
- if value is None:
- continue
-
- if isinstance(value, dict):
- self._encrypt_kwargs(value)
- continue
-
- if self._should_encrypt(key):
- if isinstance(value, SecretStr):
- value = b64encode(
- fernet.encrypt(value.get_secret_value().encode())
- ).decode()
- else:
- value = b64encode(fernet.encrypt(value.encode())).decode()
- kwargs[key] = value
-
- def _fernet(self):
- if not self.config.jwt_secret:
- raise ValueError('jwt_secret must be defined on config')
- jwt_secret = self.config.jwt_secret.get_secret_value()
- fernet_key = b64encode(hashlib.sha256(jwt_secret.encode()).digest())
- return Fernet(fernet_key)
-
async def _ensure_api_key(
self, item: Settings, org_id: str, openhands_type: bool = False
) -> None:
@@ -304,9 +308,11 @@ class SaasSettingsStore(SettingsStore):
is valid in LiteLLM. If valid, reuses it. Otherwise, generates a new key.
"""
+ llm_api_key = item.agent_settings.llm.api_key
+
# First, check if our current key is valid
- if item.llm_api_key and not await LiteLlmManager.verify_existing_key(
- item.llm_api_key.get_secret_value(),
+ if llm_api_key and not await LiteLlmManager.verify_existing_key(
+ llm_api_key.get_secret_value(),
self.user_id,
org_id,
openhands_type=openhands_type,
@@ -329,7 +335,7 @@ class SaasSettingsStore(SettingsStore):
None,
)
- item.llm_api_key = SecretStr(generated_key)
+ item.agent_settings.llm.api_key = SecretStr(generated_key)
logger.info(
'saas_settings_store:store:generated_openhands_key',
extra={'user_id': self.user_id},
diff --git a/enterprise/storage/user_settings.py b/enterprise/storage/user_settings.py
index 38fade45d7..441c3df8fb 100644
--- a/enterprise/storage/user_settings.py
+++ b/enterprise/storage/user_settings.py
@@ -1,6 +1,10 @@
+from __future__ import annotations
+
+from pydantic import SecretStr
from server.constants import DEFAULT_BILLING_MARGIN
from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Identity, Integer, String
from storage.base import Base
+from storage.encrypt_utils import decrypt_legacy_value, encrypt_legacy_value
class UserSettings(Base): # type: ignore
@@ -8,17 +12,11 @@ class UserSettings(Base): # type: ignore
id = Column(Integer, Identity(), primary_key=True)
keycloak_user_id = Column(String, nullable=True, index=True)
language = Column(String, nullable=True)
- agent = Column(String, nullable=True)
- max_iterations = Column(Integer, nullable=True)
- security_analyzer = Column(String, nullable=True)
- confirmation_mode = Column(Boolean, nullable=True, default=False)
- llm_model = Column(String, nullable=True)
+ # Deprecated (v0): API keys now live on Org / OrgMember.
+ # Kept for backward-compat during migration; do not use in new code.
llm_api_key = Column(String, nullable=True)
llm_api_key_for_byor = Column(String, nullable=True)
- llm_base_url = Column(String, nullable=True)
remote_runtime_resource_factor = Column(Integer, nullable=True)
- enable_default_condenser = Column(Boolean, nullable=False, default=True)
- condenser_max_size = Column(Integer, nullable=True)
user_consents_to_analytics = Column(Boolean, nullable=True)
billing_margin = Column(Float, nullable=True, default=DEFAULT_BILLING_MARGIN)
enable_sound_notifications = Column(Boolean, nullable=True, default=False)
@@ -30,6 +28,7 @@ class UserSettings(Base): # type: ignore
sandbox_grouping_strategy = Column(String, nullable=True)
user_version = Column(Integer, nullable=False, default=0)
accepted_tos = Column(DateTime, nullable=True)
+ # Deprecated (v0): mcp_config now lives inside AgentSettings on Org / OrgMember.
mcp_config = Column(JSON, nullable=True)
disabled_skills = Column(JSON, nullable=True)
search_api_key = Column(String, nullable=True)
@@ -41,6 +40,38 @@ class UserSettings(Base): # type: ignore
git_user_name = Column(String, nullable=True)
git_user_email = Column(String, nullable=True)
v1_enabled = Column(Boolean, nullable=True)
+ agent_settings = Column(JSON, nullable=False, default=dict)
+ conversation_settings = Column(JSON, nullable=False, default=dict)
+
+ @property
+ def llm_api_key_for_byor_secret(self) -> SecretStr | None:
+ raw = self.llm_api_key_for_byor
+ if not raw:
+ return None
+ try:
+ return SecretStr(decrypt_legacy_value(raw))
+ except Exception:
+ return SecretStr(raw)
+
+ @llm_api_key_for_byor_secret.setter
+ def llm_api_key_for_byor_secret(self, value: str | SecretStr | None) -> None:
+ if value is None:
+ self.llm_api_key_for_byor = None
+ return
+ raw = value.get_secret_value() if isinstance(value, SecretStr) else value
+ self.llm_api_key_for_byor = encrypt_legacy_value(raw)
+
already_migrated = Column(
Boolean, nullable=True, default=False
) # False = not migrated, True = migrated
+
+ def to_settings(self):
+ from openhands.sdk.settings import AgentSettings, ConversationSettings
+ from openhands.storage.data_models.settings import Settings
+
+ return Settings(
+ agent_settings=AgentSettings.model_validate(self.agent_settings or {}),
+ conversation_settings=ConversationSettings.model_validate(
+ self.conversation_settings or {}
+ ),
+ )
diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.py
index 6151f0bca2..575baaf33c 100644
--- a/enterprise/storage/user_store.py
+++ b/enterprise/storage/user_store.py
@@ -30,6 +30,8 @@ from storage.user import User
from storage.user_settings import UserSettings
from utils.identity import resolve_display_name
+from openhands.sdk.settings import AGENT_SETTINGS_SCHEMA_VERSION
+
# The max possible time to wait for another process to finish creating a user before retrying
_REDIS_CREATE_TIMEOUT_SECONDS = 30
# The delay to wait for another process to finish creating a user before trying to load again
@@ -92,9 +94,6 @@ class UserStore:
from storage.org_member_store import OrgMemberStore
org_member_kwargs = OrgMemberStore.get_kwargs_from_settings(settings)
- # avoid setting org member llm fields to use org defaults on user creation
- del org_member_kwargs['llm_model']
- del org_member_kwargs['llm_base_url']
org_member = OrgMember(
org_id=org.id,
user_id=user.id,
@@ -234,10 +233,15 @@ class UserStore:
org_kwargs = OrgStore.get_kwargs_from_user_settings(decrypted_user_settings)
org_kwargs.pop('id', None)
- # if user has custom settings, set org defaults to current version
+ # If the user has custom settings, keep the org defaults minimal.
if custom_settings:
- org_kwargs['default_llm_model'] = get_default_litellm_model()
- org_kwargs['llm_base_url'] = LITE_LLM_API_URL
+ org_kwargs['agent_settings'] = {
+ 'schema_version': AGENT_SETTINGS_SCHEMA_VERSION,
+ 'llm': {
+ 'model': get_default_litellm_model(),
+ 'base_url': LITE_LLM_API_URL,
+ },
+ }
org_kwargs['org_version'] = ORG_SETTINGS_VERSION
for key, value in org_kwargs.items():
@@ -277,12 +281,10 @@ class UserStore:
org_member_kwargs = OrgMemberStore.get_kwargs_from_user_settings(
decrypted_user_settings
)
-
- # if the user did not have custom settings in the old model,
- # then use the org defaults by not setting org_member fields
if not custom_settings:
- del org_member_kwargs['llm_model']
- del org_member_kwargs['llm_base_url']
+ org_member_kwargs['agent_settings_diff'] = (
+ OrgStore.get_agent_settings_from_org(org).model_dump(mode='json')
+ )
org_member = OrgMember(
org_id=org.id,
@@ -1011,44 +1013,30 @@ class UserStore:
Returns:
A new UserSettings object populated from the entities
"""
- # Mapping from OrgMember fields to corresponding Org "default_" fields
- org_member_to_org_default = {
- 'llm_model': 'default_llm_model',
- 'llm_base_url': 'default_llm_base_url',
- 'max_iterations': 'default_max_iterations',
- }
+ from storage.org_store import OrgStore
- def get_value_with_org_fallback(field_name: str, org_member_value):
- """Get value from OrgMember, falling back to Org default if None."""
- if org_member_value is not None:
- return org_member_value
- org_default_field = org_member_to_org_default.get(field_name)
- if org_default_field and hasattr(org, org_default_field):
- return getattr(org, org_default_field)
- return None
+ member_agent_settings_diff = dict(org_member.agent_settings_diff)
+ org_agent_settings = OrgStore.get_agent_settings_from_org(org)
+ agent_settings = {
+ **org_agent_settings.model_dump(mode='json'),
+ **member_agent_settings_diff,
+ }
- # Get values from OrgMember with Org fallback for fields with default_ prefix
- llm_model = get_value_with_org_fallback('llm_model', org_member.llm_model)
- llm_base_url = get_value_with_org_fallback(
- 'llm_base_url', org_member.llm_base_url
- )
- max_iterations = get_value_with_org_fallback(
- 'max_iterations', org_member.max_iterations
- )
+ member_conversation_settings_diff = dict(org_member.conversation_settings_diff)
+ org_conversation_settings = OrgStore.get_conversation_settings_from_org(org)
+ conversation_settings = {
+ **org_conversation_settings.model_dump(mode='json'),
+ **member_conversation_settings_diff,
+ }
return UserSettings(
keycloak_user_id=user_id,
- # OrgMember fields
llm_api_key=org_member.llm_api_key.get_secret_value()
if org_member.llm_api_key
else None,
llm_api_key_for_byor=org_member.llm_api_key_for_byor.get_secret_value()
if org_member.llm_api_key_for_byor
else None,
- llm_model=llm_model,
- llm_base_url=llm_base_url,
- max_iterations=max_iterations,
- # User fields
accepted_tos=user.accepted_tos,
enable_sound_notifications=user.enable_sound_notifications,
language=user.language,
@@ -1057,18 +1045,12 @@ class UserStore:
email_verified=user.email_verified,
git_user_name=user.git_user_name,
git_user_email=user.git_user_email,
- # Org fields
- agent=org.agent,
- security_analyzer=org.security_analyzer,
- confirmation_mode=org.confirmation_mode,
remote_runtime_resource_factor=org.remote_runtime_resource_factor,
- enable_default_condenser=org.enable_default_condenser,
billing_margin=org.billing_margin,
enable_proactive_conversation_starters=org.enable_proactive_conversation_starters,
sandbox_base_container_image=org.sandbox_base_container_image,
sandbox_runtime_container_image=org.sandbox_runtime_container_image,
user_version=org.org_version,
- mcp_config=org.mcp_config,
search_api_key=org.search_api_key.get_secret_value()
if org.search_api_key
else None,
@@ -1078,7 +1060,9 @@ class UserStore:
max_budget_per_task=org.max_budget_per_task,
enable_solvability_analysis=org.enable_solvability_analysis,
v1_enabled=org.v1_enabled,
- condenser_max_size=org.condenser_max_size,
+ sandbox_grouping_strategy=org.sandbox_grouping_strategy,
+ agent_settings=agent_settings,
+ conversation_settings=conversation_settings,
already_migrated=False,
)
@@ -1096,15 +1080,17 @@ class UserStore:
Returns:
True if user has custom settings, False if using old defaults
"""
- # Normalize values
- user_model = (
- user_settings.llm_model.strip() or None if user_settings.llm_model else None
- )
- user_base_url = (
- user_settings.llm_base_url.strip() or None
- if user_settings.llm_base_url
- else None
- )
+ persisted_agent_settings = user_settings.agent_settings or {}
+ llm_settings = persisted_agent_settings.get('llm', {})
+ if isinstance(llm_settings, dict):
+ user_model = llm_settings.get('model')
+ user_base_url = llm_settings.get('base_url')
+ else:
+ user_model = None
+ user_base_url = None
+
+ user_model = user_model.strip() or None if user_model else None
+ user_base_url = user_base_url.strip() or None if user_base_url else None
# Custom base_url = definitely custom settings (BYOK)
if user_base_url and user_base_url != LITE_LLM_API_URL:
diff --git a/enterprise/tests/unit/conftest.py b/enterprise/tests/unit/conftest.py
index 8777eee9e7..774fb5ba69 100644
--- a/enterprise/tests/unit/conftest.py
+++ b/enterprise/tests/unit/conftest.py
@@ -1,3 +1,4 @@
+import os
import uuid
from datetime import datetime
from uuid import UUID
@@ -37,6 +38,20 @@ from storage.stored_conversation_metadata_saas import (
from storage.stored_offline_token import StoredOfflineToken
from storage.stripe_customer import StripeCustomer
from storage.user import User
+from storage.user_settings import UserSettings # noqa: F401
+
+
[email protected](autouse=True)
+def allow_short_context_windows():
+ old = os.environ.get('ALLOW_SHORT_CONTEXT_WINDOWS')
+ os.environ['ALLOW_SHORT_CONTEXT_WINDOWS'] = 'true'
+ try:
+ yield
+ finally:
+ if old is None:
+ os.environ.pop('ALLOW_SHORT_CONTEXT_WINDOWS', None)
+ else:
+ os.environ['ALLOW_SHORT_CONTEXT_WINDOWS'] = old
@pytest.fixture
@@ -172,7 +187,6 @@ def add_minimal_fixtures(session_maker):
id=uuid.UUID('5594c7b6-f959-4b81-92e9-b09c206f5081'),
name='mock-org',
org_version=ORG_SETTINGS_VERSION,
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
)
diff --git a/enterprise/tests/unit/server/auth/test_saas_user_auth_org_info.py b/enterprise/tests/unit/server/auth/test_saas_user_auth_org_info.py
index 9644f312c8..ff6f5d6e40 100644
--- a/enterprise/tests/unit/server/auth/test_saas_user_auth_org_info.py
+++ b/enterprise/tests/unit/server/auth/test_saas_user_auth_org_info.py
@@ -72,7 +72,6 @@ async def create_org(session_maker, org_id: uuid.UUID, name: str) -> Org:
id=org_id,
name=name,
org_version=1,
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
session.add(org)
@@ -139,11 +138,12 @@ class TestGetOrgInfoWithRealDB:
)
# Patch the global a_session_maker in all stores that use it
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is not None
@@ -171,11 +171,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is not None
@@ -201,11 +202,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is not None
@@ -226,11 +228,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is None
@@ -257,11 +260,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is None
@@ -282,11 +286,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
# First call
org_info1 = await user_auth.get_org_info()
assert org_info1 is not None
@@ -307,11 +312,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
# First call
org_info1 = await user_auth.get_org_info()
assert org_info1 is None
@@ -337,11 +343,12 @@ class TestGetOrgInfoWithRealDB:
refresh_token=SecretStr('mock_refresh_token'),
)
- with patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
- ), patch(
- 'storage.org_member_store.a_session_maker', async_session_maker
- ), patch('storage.role_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
+ patch('storage.org_member_store.a_session_maker', async_session_maker),
+ patch('storage.role_store.a_session_maker', async_session_maker),
+ ):
org_info = await user_auth.get_org_info()
assert org_info is not None
diff --git a/enterprise/tests/unit/server/routes/test_orgs.py b/enterprise/tests/unit/server/routes/test_orgs.py
index 069896b2cf..496ce2e5ba 100644
--- a/enterprise/tests/unit/server/routes/test_orgs.py
+++ b/enterprise/tests/unit/server/routes/test_orgs.py
@@ -106,8 +106,9 @@ async def test_create_org_success(mock_app):
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
- enable_default_condenser=True,
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ },
enable_proactive_conversation_starters=True,
)
@@ -140,7 +141,10 @@ async def test_create_org_success(mock_app):
assert response_data['contact_email'] == '[email protected]'
assert response_data['credits'] == 100.0
assert response_data['org_version'] == 5
- assert response_data['default_llm_model'] == 'claude-opus-4-5-20251101'
+ assert (
+ response_data['agent_settings']['llm']['model']
+ == 'claude-opus-4-5-20251101'
+ )
@pytest.mark.asyncio
@@ -427,8 +431,10 @@ async def test_create_org_sensitive_fields_not_exposed(mock_app):
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
- enable_default_condenser=True,
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ 'condenser': {'enabled': True},
+ },
enable_proactive_conversation_starters=True,
)
@@ -507,7 +513,9 @@ async def test_list_user_orgs_success(mock_app_list):
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ },
)
mock_user = MagicMock()
mock_user.current_org_id = org_id
@@ -918,20 +926,25 @@ async def test_list_user_orgs_all_fields_present(mock_app_list):
contact_name='John Doe',
contact_email='[email protected]',
conversation_expiration=3600,
- agent='CodeActAgent',
- default_max_iterations=50,
- security_analyzer='enabled',
- confirmation_mode=True,
- default_llm_model='claude-opus-4-5-20251101',
- default_llm_base_url='https://api.example.com',
+ agent_settings={
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'claude-opus-4-5-20251101',
+ 'base_url': 'https://api.example.com',
+ },
+ 'condenser': {'enabled': True},
+ },
+ conversation_settings={
+ 'max_iterations': 50,
+ 'security_analyzer': 'llm',
+ 'confirmation_mode': True,
+ },
remote_runtime_resource_factor=2,
- enable_default_condenser=True,
billing_margin=0.15,
enable_proactive_conversation_starters=True,
sandbox_base_container_image='test-image',
sandbox_runtime_container_image='test-runtime',
org_version=5,
- mcp_config={'key': 'value'},
max_budget_per_task=1000.0,
enable_solvability_analysis=True,
v1_enabled=True,
@@ -962,20 +975,20 @@ async def test_list_user_orgs_all_fields_present(mock_app_list):
assert org_data['contact_name'] == 'John Doe'
assert org_data['contact_email'] == '[email protected]'
assert org_data['conversation_expiration'] == 3600
- assert org_data['agent'] == 'CodeActAgent'
- assert org_data['default_max_iterations'] == 50
- assert org_data['security_analyzer'] == 'enabled'
- assert org_data['confirmation_mode'] is True
- assert org_data['default_llm_model'] == 'claude-opus-4-5-20251101'
- assert org_data['default_llm_base_url'] == 'https://api.example.com'
+ assert org_data['agent_settings']['agent'] == 'CodeActAgent'
+ assert org_data['agent_settings']['llm']['model'] == 'claude-opus-4-5-20251101'
+ assert (
+ org_data['agent_settings']['llm']['base_url'] == 'https://api.example.com'
+ )
+ assert org_data['conversation_settings']['max_iterations'] == 50
+ assert org_data['conversation_settings']['security_analyzer'] == 'llm'
+ assert org_data['conversation_settings']['confirmation_mode'] is True
assert org_data['remote_runtime_resource_factor'] == 2
- assert org_data['enable_default_condenser'] is True
assert org_data['billing_margin'] == 0.15
assert org_data['enable_proactive_conversation_starters'] is True
assert org_data['sandbox_base_container_image'] == 'test-image'
assert org_data['sandbox_runtime_container_image'] == 'test-runtime'
assert org_data['org_version'] == 5
- assert org_data['mcp_config'] == {'key': 'value'}
assert org_data['max_budget_per_task'] == 1000.0
assert org_data['enable_solvability_analysis'] is True
assert org_data['v1_enabled'] is True
@@ -1020,8 +1033,10 @@ async def test_get_org_success(mock_app_with_get_user_id, mock_owner_role):
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
- enable_default_condenser=True,
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ 'condenser': {'enabled': True},
+ },
enable_proactive_conversation_starters=True,
)
@@ -1298,8 +1313,10 @@ async def test_get_org_with_credits_none(mock_app_with_get_user_id, mock_owner_r
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
- enable_default_condenser=True,
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ 'condenser': {'enabled': True},
+ },
enable_proactive_conversation_starters=True,
)
@@ -1345,10 +1362,12 @@ async def test_get_org_sensitive_fields_not_exposed(
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ 'condenser': {'enabled': True},
+ },
search_api_key='secret-search-key-123', # Should not be exposed
sandbox_api_key='secret-sandbox-key-123', # Should not be exposed
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
@@ -1872,7 +1891,9 @@ async def test_update_org_permission_denied_llm_settings(
"""
# Arrange
org_id = uuid.uuid4()
- update_data = {'default_llm_model': 'claude-opus-4-5-20251101'}
+ update_data = {
+ 'agent_settings_diff': {'llm': {'model': 'claude-opus-4-5-20251101'}}
+ }
with (
patch(
@@ -2032,13 +2053,13 @@ async def test_update_org_invalid_uuid_format(mock_update_app):
@pytest.mark.asyncio
async def test_update_org_invalid_field_values(mock_update_app, mock_owner_role):
"""
- GIVEN: Update request with invalid field values (e.g., negative max_iterations)
+ GIVEN: Update request with invalid field values (e.g., negative billing margin)
WHEN: PATCH /api/organizations/{org_id} is called
THEN: 422 validation error is returned
"""
# Arrange
org_id = uuid.uuid4()
- update_data = {'default_max_iterations': -1} # Invalid: must be > 0
+ update_data = {'billing_margin': -1} # Invalid: must be >= 0
with patch(
'server.auth.authorization.get_user_org_role',
@@ -2995,20 +3016,24 @@ class TestGetMeEndpoint:
llm_model='gpt-4',
llm_base_url='https://api.example.com',
max_iterations=50,
- llm_api_key_for_byor=None,
status_val='active',
):
"""Create a MeResponse for testing."""
+ agent_settings = {'schema_version': 1}
+ if llm_model is not None:
+ agent_settings.setdefault('llm', {})['model'] = llm_model
+ if llm_base_url is not None:
+ agent_settings.setdefault('llm', {})['base_url'] = llm_base_url
+ if max_iterations is not None:
+ agent_settings['max_iterations'] = max_iterations
+
return MeResponse(
org_id=str(org_id),
user_id=str(user_id),
email=email,
role=role,
llm_api_key=llm_api_key,
- llm_model=llm_model,
- llm_base_url=llm_base_url,
- max_iterations=max_iterations,
- llm_api_key_for_byor=llm_api_key_for_byor,
+ agent_settings_diff=agent_settings,
status=status_val,
)
@@ -3043,9 +3068,11 @@ class TestGetMeEndpoint:
assert data['user_id'] == test_user_id
assert data['email'] == '[email protected]'
assert data['role'] == 'owner'
- assert data['llm_model'] == 'gpt-4'
- assert data['llm_base_url'] == 'https://api.example.com'
- assert data['max_iterations'] == 50
+ assert data['agent_settings_diff']['llm']['model'] == 'gpt-4'
+ assert (
+ data['agent_settings_diff']['llm']['base_url'] == 'https://api.example.com'
+ )
+ assert data['agent_settings_diff']['max_iterations'] == 50
assert data['status'] == 'active'
@pytest.mark.asyncio
@@ -3169,9 +3196,7 @@ class TestGetMeEndpoint:
assert response.status_code == status.HTTP_200_OK
data = response.json()
- assert data['llm_model'] is None
- assert data['llm_base_url'] is None
- assert data['max_iterations'] is None
+ assert data['agent_settings_diff'] == {'schema_version': 1}
@pytest.mark.asyncio
async def test_get_me_with_admin_role(self, mock_me_app, test_user_id, test_org_id):
@@ -3200,35 +3225,6 @@ class TestGetMeEndpoint:
data = response.json()
assert data['role'] == 'admin'
- @pytest.mark.asyncio
- async def test_get_me_masks_byor_api_key(
- self, mock_me_app, test_user_id, test_org_id
- ):
- """GIVEN: User has an llm_api_key_for_byor set
- WHEN: GET /api/organizations/{org_id}/me is called
- THEN: The llm_api_key_for_byor field is also masked
- """
- me_response = self._make_me_response(
- org_id=test_org_id,
- user_id=test_user_id,
- llm_api_key_for_byor='****-key', # Masked key
- )
-
- with patch(
- 'server.routes.orgs.OrgMemberService.get_me',
- new_callable=AsyncMock,
- return_value=me_response,
- ):
- client = TestClient(mock_me_app)
- response = client.get(f'/api/organizations/{test_org_id}/me')
-
- assert response.status_code == status.HTTP_200_OK
- data = response.json()
- assert data['llm_api_key_for_byor'] != 'sk-byor-secret-key'
- assert (
- data['llm_api_key_for_byor'] is None or '**' in data['llm_api_key_for_byor']
- )
-
@pytest.mark.asyncio
async def test_get_me_role_not_found_returns_500(self, mock_me_app, test_org_id):
"""GIVEN: Role lookup fails (data integrity issue)
@@ -3315,7 +3311,9 @@ async def test_switch_org_success(mock_app_with_get_user_id):
contact_name='John Doe',
contact_email='[email protected]',
org_version=5,
- default_llm_model='claude-opus-4-5-20251101',
+ agent_settings={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ },
)
with (
diff --git a/enterprise/tests/unit/server/services/test_org_llm_settings_service.py b/enterprise/tests/unit/server/services/test_org_llm_settings_service.py
index 70c44d36f8..7a5d1f5185 100644
--- a/enterprise/tests/unit/server/services/test_org_llm_settings_service.py
+++ b/enterprise/tests/unit/server/services/test_org_llm_settings_service.py
@@ -34,15 +34,17 @@ def mock_org(org_id):
"""Create a mock organization with LLM settings."""
org = MagicMock(spec=Org)
org.id = org_id
- org.default_llm_model = 'claude-3'
- org.default_llm_base_url = 'https://api.anthropic.com'
+ org.agent_settings = {
+ 'schema_version': 1,
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'claude-3',
+ 'base_url': 'https://api.anthropic.com',
+ },
+ }
+ org.conversation_settings = {}
+ org.llm_api_key = None
org.search_api_key = None
- org.agent = 'CodeActAgent'
- org.confirmation_mode = True
- org.security_analyzer = None
- org.enable_default_condenser = True
- org.condenser_max_size = None
- org.default_max_iterations = 50
return org
@@ -78,8 +80,8 @@ async def test_get_org_llm_settings_success(
# Assert
assert isinstance(result, OrgLLMSettingsResponse)
- assert result.default_llm_model == 'claude-3'
- assert result.agent == 'CodeActAgent'
+ assert result.agent_settings.llm.model == 'claude-3'
+ assert result.agent_settings.agent == 'CodeActAgent'
mock_store.get_current_org_by_user_id.assert_called_once_with(user_id)
@@ -134,20 +136,26 @@ async def test_update_org_llm_settings_success(
# Arrange
updated_org = MagicMock(spec=Org)
updated_org.id = mock_org.id
- updated_org.default_llm_model = 'new-model'
- updated_org.default_llm_base_url = None
+ updated_org.agent_settings = {
+ 'schema_version': 1,
+ 'agent': 'CodeActAgent',
+ 'llm': {'model': 'new-model'},
+ }
+ updated_org.conversation_settings = {
+ 'confirmation_mode': False,
+ 'max_iterations': 100,
+ }
+ updated_org.llm_api_key = None
updated_org.search_api_key = None
- updated_org.agent = 'CodeActAgent'
- updated_org.confirmation_mode = False
- updated_org.security_analyzer = None
- updated_org.enable_default_condenser = True
- updated_org.condenser_max_size = None
- updated_org.default_max_iterations = 100
update_data = OrgLLMSettingsUpdate(
- default_llm_model='new-model',
- confirmation_mode=False,
- default_max_iterations=100,
+ agent_settings_diff={
+ 'llm': {'model': 'new-model'},
+ },
+ conversation_settings_diff={
+ 'confirmation_mode': False,
+ 'max_iterations': 100,
+ },
)
mock_store.get_current_org_by_user_id = AsyncMock(return_value=mock_org)
@@ -159,9 +167,9 @@ async def test_update_org_llm_settings_success(
# Assert
assert isinstance(result, OrgLLMSettingsResponse)
- assert result.default_llm_model == 'new-model'
- assert result.confirmation_mode is False
- assert result.default_max_iterations == 100
+ assert result.agent_settings.llm.model == 'new-model'
+ assert result.conversation_settings.confirmation_mode is False
+ assert result.conversation_settings.max_iterations == 100
mock_store.update_org_llm_settings.assert_called_once_with(
org_id=mock_org.id,
update_data=update_data,
@@ -189,7 +197,7 @@ async def test_update_org_llm_settings_no_changes(
# Assert
assert isinstance(result, OrgLLMSettingsResponse)
- assert result.default_llm_model == 'claude-3'
+ assert result.agent_settings.llm.model == 'claude-3'
mock_store.update_org_llm_settings.assert_not_called()
@@ -203,7 +211,9 @@ async def test_update_org_llm_settings_org_not_found(
THEN: OrgNotFoundError is raised
"""
# Arrange
- update_data = OrgLLMSettingsUpdate(default_llm_model='new-model')
+ update_data = OrgLLMSettingsUpdate(
+ agent_settings_diff={'llm': {'model': 'new-model'}}
+ )
mock_store.get_current_org_by_user_id = AsyncMock(return_value=None)
service = OrgLLMSettingsService(store=mock_store, user_context=mock_user_context)
diff --git a/enterprise/tests/unit/server/services/test_org_member_service.py b/enterprise/tests/unit/server/services/test_org_member_service.py
index 440ecde4ba..b0ad3ed383 100644
--- a/enterprise/tests/unit/server/services/test_org_member_service.py
+++ b/enterprise/tests/unit/server/services/test_org_member_service.py
@@ -2224,10 +2224,15 @@ class TestOrgMemberServiceGetMe:
member.user_id = current_user_id
member.role_id = 1
member.llm_api_key = SecretStr('sk-test-key-12345')
- member.llm_api_key_for_byor = None
- member.llm_model = 'gpt-4'
- member.llm_base_url = 'https://api.example.com'
- member.max_iterations = 50
+ member.agent_settings_diff = {
+ 'llm': {
+ 'model': 'gpt-4',
+ 'base_url': 'https://api.example.com',
+ },
+ }
+ member.conversation_settings_diff = {
+ 'max_iterations': 50,
+ }
member.status = 'active'
return member
@@ -2275,8 +2280,8 @@ class TestOrgMemberServiceGetMe:
assert result.user_id == str(current_user_id)
assert result.email == '[email protected]'
assert result.role == 'owner'
- assert result.llm_model == 'gpt-4'
- assert result.max_iterations == 50
+ assert result.agent_settings_diff['llm']['model'] == 'gpt-4'
+ assert result.conversation_settings_diff['max_iterations'] == 50
assert result.status == 'active'
@pytest.mark.asyncio
diff --git a/enterprise/tests/unit/storage/test_org_llm_settings_store.py b/enterprise/tests/unit/storage/test_org_llm_settings_store.py
index 1565ddee6b..a27a2ff0d4 100644
--- a/enterprise/tests/unit/storage/test_org_llm_settings_store.py
+++ b/enterprise/tests/unit/storage/test_org_llm_settings_store.py
@@ -5,7 +5,6 @@ Tests the async database operations for organization LLM settings.
"""
import uuid
-from unittest.mock import AsyncMock, patch
import pytest
from server.routes.org_models import OrgLLMSettingsUpdate
@@ -47,7 +46,10 @@ async def test_get_current_org_by_user_id_success(async_session_maker):
"""
# Arrange
async with async_session_maker() as session:
- org = Org(name='test-org', default_llm_model='claude-3')
+ org = Org(
+ name='test-org',
+ agent_settings={'schema_version': 1, 'llm': {'model': 'claude-3'}},
+ )
session.add(org)
await session.flush()
@@ -63,7 +65,7 @@ async def test_get_current_org_by_user_id_success(async_session_maker):
# Assert
assert result is not None
assert result.name == 'test-org'
- assert result.default_llm_model == 'claude-3'
+ assert result.agent_settings['llm']['model'] == 'claude-3'
@pytest.mark.asyncio
@@ -94,30 +96,33 @@ async def test_update_org_llm_settings_success(async_session_maker):
"""
# Arrange
async with async_session_maker() as session:
- org = Org(name='test-org', default_llm_model='old-model')
+ org = Org(
+ name='test-org',
+ agent_settings={'schema_version': 1, 'llm': {'model': 'old-model'}},
+ )
session.add(org)
await session.commit()
org_id = org.id
update_data = OrgLLMSettingsUpdate(
- default_llm_model='new-model',
- agent='CodeActAgent',
- confirmation_mode=True,
+ agent_settings_diff={
+ 'llm': {'model': 'new-model'},
+ 'agent': 'CodeActAgent',
+ },
+ conversation_settings_diff={
+ 'confirmation_mode': True,
+ },
)
# Act
store = OrgLLMSettingsStore(db_session=session)
- with patch(
- 'storage.org_llm_settings_store.OrgMemberStore.update_all_members_llm_settings_async',
- AsyncMock(),
- ):
- result = await store.update_org_llm_settings(org_id, update_data)
+ result = await store.update_org_llm_settings(org_id, update_data)
# Assert
assert result is not None
- assert result.default_llm_model == 'new-model'
- assert result.agent == 'CodeActAgent'
- assert result.confirmation_mode is True
+ assert result.agent_settings['llm']['model'] == 'new-model'
+ assert result.agent_settings['agent'] == 'CodeActAgent'
+ assert result.conversation_settings['confirmation_mode'] is True
@pytest.mark.asyncio
@@ -129,7 +134,9 @@ async def test_update_org_llm_settings_org_not_found(async_session_maker):
"""
# Arrange
non_existent_org_id = uuid.uuid4()
- update_data = OrgLLMSettingsUpdate(default_llm_model='new-model')
+ update_data = OrgLLMSettingsUpdate(
+ agent_settings_diff={'llm': {'model': 'new-model'}}
+ )
# Act
async with async_session_maker() as session:
@@ -141,35 +148,33 @@ async def test_update_org_llm_settings_org_not_found(async_session_maker):
@pytest.mark.asyncio
-async def test_update_org_llm_settings_propagates_to_members(async_session_maker):
+async def test_update_org_llm_settings_updates_org_defaults_only(async_session_maker):
"""
- GIVEN: An organization exists with update data containing member-relevant settings
+ GIVEN: An organization exists with new org-wide defaults
WHEN: update_org_llm_settings is called
- THEN: Member settings are propagated via OrgMemberStore
+ THEN: The org defaults are updated without requiring member propagation
"""
- # Arrange
async with async_session_maker() as session:
- org = Org(name='test-org', default_llm_model='old-model')
+ org = Org(
+ name='test-org',
+ agent_settings={'schema_version': 1, 'llm': {'model': 'old-model'}},
+ )
session.add(org)
await session.commit()
- org_id = org.id
- update_data = OrgLLMSettingsUpdate(
- default_llm_model='new-model',
- llm_api_key='new-api-key',
+ store = OrgLLMSettingsStore(db_session=session)
+ result = await store.update_org_llm_settings(
+ org.id,
+ OrgLLMSettingsUpdate(
+ agent_settings_diff={'llm': {'model': 'new-model'}},
+ llm_api_key='new-api-key',
+ search_api_key='search-key',
+ ),
)
- # Act
- store = OrgLLMSettingsStore(db_session=session)
- with patch(
- 'storage.org_llm_settings_store.OrgMemberStore.update_all_members_llm_settings_async',
- AsyncMock(),
- ) as mock_update_members:
- await store.update_org_llm_settings(org_id, update_data)
-
- # Assert
- mock_update_members.assert_called_once()
- call_args = mock_update_members.call_args
- member_settings = call_args[0][2]
- assert member_settings.llm_model == 'new-model'
- assert member_settings.llm_api_key == 'new-api-key'
+ assert result is not None
+ assert result.agent_settings['llm']['model'] == 'new-model'
+ assert result.llm_api_key is not None
+ assert result.llm_api_key.get_secret_value() == 'new-api-key'
+ assert result.search_api_key is not None
+ assert result.search_api_key.get_secret_value() == 'search-key'
diff --git a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py
index 83a25d3cdf..37cda4dca2 100644
--- a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py
+++ b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py
@@ -76,13 +76,11 @@ async def async_session_with_users(async_engine) -> AsyncGenerator[AsyncSession,
org1 = Org(
id=ORG1_ID,
name='test-org-1',
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
org2 = Org(
id=ORG2_ID,
name='test-org-2',
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
db_session.add(org1)
diff --git a/enterprise/tests/unit/test_billing.py b/enterprise/tests/unit/test_billing.py
index 18262790fa..5f92cd383a 100644
--- a/enterprise/tests/unit/test_billing.py
+++ b/enterprise/tests/unit/test_billing.py
@@ -75,7 +75,6 @@ async def test_org(async_session_maker):
id=org_id,
name=f'test-org-{org_id}',
org_version=ORG_SETTINGS_VERSION,
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
session.add(org)
diff --git a/enterprise/tests/unit/test_lite_llm_manager.py b/enterprise/tests/unit/test_lite_llm_manager.py
index 74611f0a8d..8d592f674c 100644
--- a/enterprise/tests/unit/test_lite_llm_manager.py
+++ b/enterprise/tests/unit/test_lite_llm_manager.py
@@ -23,6 +23,20 @@ from storage.user_settings import UserSettings
from openhands.server.settings import Settings
+def _agent_value(settings: Settings, key: str):
+ """Navigate into settings.agent_settings using a dot-separated key."""
+ obj = settings.agent_settings
+ for part in key.split('.'):
+ obj = getattr(obj, part)
+ return obj
+
+
+def _secret_value(settings: Settings, key: str):
+ """Navigate into settings.agent_settings and unwrap SecretStr values."""
+ secret = _agent_value(settings, key)
+ return secret.get_secret_value() if secret else None
+
+
class TestDefaultInitialBudget:
"""Test cases for DEFAULT_INITIAL_BUDGET configuration."""
@@ -122,20 +136,33 @@ class TestLiteLlmManager:
def mock_settings(self):
"""Create a mock Settings object."""
settings = Settings()
- settings.agent = 'TestAgent'
- settings.llm_model = 'test-model'
- settings.llm_api_key = SecretStr('test-key')
- settings.llm_base_url = 'http://test.com'
+ settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'TestAgent',
+ 'llm': {
+ 'model': 'test-model',
+ 'api_key': 'test-key',
+ 'base_url': 'http://test.com',
+ },
+ },
+ }
+ )
return settings
@pytest.fixture
def mock_user_settings(self):
"""Create a mock UserSettings object."""
user_settings = UserSettings()
- user_settings.agent = 'TestAgent'
- user_settings.llm_model = 'test-model'
+ user_settings.agent_settings = {
+ 'agent': 'TestAgent',
+ 'llm': {
+ 'model': 'test-model',
+ 'base_url': 'http://test.com',
+ 'api_key': 'test-key',
+ },
+ }
user_settings.llm_api_key = SecretStr('test-key')
- user_settings.llm_base_url = 'http://test.com'
user_settings.user_version = 4 # Set version to avoid None comparison
return user_settings
@@ -228,10 +255,12 @@ class TestLiteLlmManager:
)
assert result is not None
- assert result.agent == 'CodeActAgent'
- assert result.llm_model == get_default_litellm_model()
- assert result.llm_api_key.get_secret_value() == 'test-key'
- assert result.llm_base_url == 'http://test.com'
+ assert _agent_value(result, 'agent') == 'CodeActAgent'
+ assert (
+ _agent_value(result, 'llm.model') == get_default_litellm_model()
+ )
+ assert _secret_value(result, 'llm.api_key') == 'test-key'
+ assert _agent_value(result, 'llm.base_url') == 'http://test.com'
@pytest.mark.asyncio
async def test_create_entries_cloud_deployment(self, mock_settings, mock_response):
@@ -275,10 +304,10 @@ class TestLiteLlmManager:
)
assert result is not None
- assert result.agent == 'CodeActAgent'
- assert result.llm_model == get_default_litellm_model()
- assert result.llm_api_key.get_secret_value() == 'test-api-key'
- assert result.llm_base_url == 'http://test.com'
+ assert _agent_value(result, 'agent') == 'CodeActAgent'
+ assert _agent_value(result, 'llm.model') == get_default_litellm_model()
+ assert _secret_value(result, 'llm.api_key') == 'test-api-key'
+ assert _agent_value(result, 'llm.base_url') == 'http://test.com'
# Verify API calls were made (get_team + user_exists + 4 posts)
assert mock_client.get.call_count == 2 # get_team + user_exists
@@ -530,10 +559,14 @@ class TestLiteLlmManager:
# migrate_entries returns the user_settings unchanged
assert result is not None
- assert result.agent == 'TestAgent'
- assert result.llm_model == 'test-model'
+ effective_settings = result.to_settings()
+ assert _agent_value(effective_settings, 'agent') == 'TestAgent'
+ assert _agent_value(effective_settings, 'llm.model') == 'test-model'
assert result.llm_api_key.get_secret_value() == 'test-key'
- assert result.llm_base_url == 'http://test.com'
+ assert (
+ _agent_value(effective_settings, 'llm.base_url')
+ == 'http://test.com'
+ )
@pytest.mark.asyncio
async def test_migrate_entries_no_user_found(self, mock_user_settings):
@@ -654,10 +687,19 @@ class TestLiteLlmManager:
# migrate_entries returns the user_settings unchanged
assert result is not None
- assert result.agent == 'TestAgent'
- assert result.llm_model == 'test-model'
+ effective_settings = result.to_settings()
+ assert (
+ _agent_value(effective_settings, 'agent') == 'TestAgent'
+ )
+ assert (
+ _agent_value(effective_settings, 'llm.model')
+ == 'test-model'
+ )
assert result.llm_api_key.get_secret_value() == 'test-key'
- assert result.llm_base_url == 'http://test.com'
+ assert (
+ _agent_value(effective_settings, 'llm.base_url')
+ == 'http://test.com'
+ )
# Verify migration steps were called:
# - 2 GET requests: _get_user, _get_user_keys
@@ -736,11 +778,12 @@ class TestLiteLlmManager:
# migrate_entries should update user_settings with the new key
assert result is not None
assert (
- result.llm_api_key.get_secret_value()
+ result.agent_settings['llm']['api_key']
== 'new-generated-key'
)
+ assert result.llm_api_key_for_byor_secret is not None
assert (
- result.llm_api_key_for_byor.get_secret_value()
+ result.llm_api_key_for_byor_secret.get_secret_value()
== 'new-generated-key'
)
@@ -2031,7 +2074,10 @@ class TestLiteLlmManager:
# downgrade_entries returns the user_settings
assert result is not None
- assert result.agent == 'TestAgent'
+ assert (
+ _agent_value(result.to_settings(), 'agent')
+ == 'TestAgent'
+ )
# Verify downgrade steps were called:
# GET requests:
@@ -2065,7 +2111,7 @@ class TestLiteLlmManager:
# In local deployment, should return user_settings without
# making any LiteLLM calls
assert result is not None
- assert result.agent == 'TestAgent'
+ assert _agent_value(result.to_settings(), 'agent') == 'TestAgent'
class TestGetAllKeysForUser:
diff --git a/enterprise/tests/unit/test_org_invitation_service.py b/enterprise/tests/unit/test_org_invitation_service.py
index 89cbcd9844..f7cd0c885b 100644
--- a/enterprise/tests/unit/test_org_invitation_service.py
+++ b/enterprise/tests/unit/test_org_invitation_service.py
@@ -99,9 +99,7 @@ class TestAcceptInvitationEmailValidation:
mock_keycloak_user_info = {'email': '[email protected]'} # Email from Keycloak
mock_org = MagicMock()
- mock_org.default_llm_model = 'test-model'
- mock_org.default_llm_base_url = None
- mock_org.default_max_iterations = None
+ mock_org.agent_settings = {'llm': {'model': 'test-model'}}
with (
patch(
@@ -225,9 +223,7 @@ class TestAcceptInvitationEmailValidation:
mock_invitation.email = '[email protected]' # Lowercase in invitation
mock_org = MagicMock()
- mock_org.default_llm_model = 'test-model'
- mock_org.default_llm_base_url = None
- mock_org.default_max_iterations = None
+ mock_org.agent_settings = {'llm': {'model': 'test-model'}}
with (
patch(
@@ -279,8 +275,10 @@ class TestAcceptInvitationEmailValidation:
mock_update_status.assert_called_once()
@pytest.mark.asyncio
- async def test_accept_invitation_inherits_org_llm_settings(self, mock_invitation):
- """Test that new members inherit the organization's LLM settings when accepting invitation."""
+ async def test_accept_invitation_starts_with_empty_agent_setting_overrides(
+ self, mock_invitation
+ ):
+ """Test that new members start without copied org agent-setting overrides."""
# Arrange
user_id = UUID('87654321-4321-8765-4321-876543218765')
token = 'inv-test-token-12345'
@@ -290,9 +288,15 @@ class TestAcceptInvitationEmailValidation:
mock_user.email = '[email protected]'
mock_org = MagicMock()
- mock_org.default_llm_model = 'claude-sonnet-4'
- mock_org.default_llm_base_url = 'https://api.anthropic.com'
- mock_org.default_max_iterations = 100
+ mock_org.agent_settings = {
+ 'llm': {
+ 'model': 'claude-sonnet-4',
+ 'base_url': 'https://api.anthropic.com',
+ },
+ }
+ mock_org.conversation_settings = {
+ 'max_iterations': 100,
+ }
with (
patch(
@@ -332,7 +336,7 @@ class TestAcceptInvitationEmailValidation:
mock_get_user.return_value = mock_user
mock_get_member.return_value = None
mock_settings = MagicMock()
- mock_settings.llm_api_key = SecretStr('test-key')
+ mock_settings.agent_settings.llm.api_key = SecretStr('test-key')
mock_create_litellm.return_value = mock_settings
mock_get_org.return_value = mock_org
mock_update_status.return_value = mock_invitation
@@ -340,12 +344,12 @@ class TestAcceptInvitationEmailValidation:
# Act
await OrgInvitationService.accept_invitation(token, user_id)
- # Assert - verify add_user_to_org was called with org's LLM settings
+ # Assert - new members should inherit org defaults at read time,
+ # not by storing a copied snapshot as personal overrides.
mock_add_user.assert_called_once()
call_kwargs = mock_add_user.call_args.kwargs
- assert call_kwargs['llm_model'] == 'claude-sonnet-4'
- assert call_kwargs['llm_base_url'] == 'https://api.anthropic.com'
- assert call_kwargs['max_iterations'] == 100
+ assert call_kwargs['llm_api_key'] == 'test-key'
+ assert call_kwargs['agent_settings_diff'] == {}
class TestCreateInvitationsBatch:
diff --git a/enterprise/tests/unit/test_org_member_store.py b/enterprise/tests/unit/test_org_member_store.py
index 3b3516ee18..f972c37b7d 100644
--- a/enterprise/tests/unit/test_org_member_store.py
+++ b/enterprise/tests/unit/test_org_member_store.py
@@ -10,6 +10,71 @@ from storage.org_member import OrgMember
from storage.org_member_store import OrgMemberStore
from storage.role import Role
from storage.user import User
+from storage.user_settings import UserSettings
+
+from openhands.storage.data_models.settings import Settings
+
+
+def test_get_kwargs_from_user_settings_uses_agent_settings_as_source_of_truth():
+ user_settings = UserSettings(
+ llm_api_key='legacy-secret',
+ agent_settings={
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'base_url': 'https://api.example.com',
+ },
+ 'condenser': {
+ 'enabled': False,
+ 'max_size': 128,
+ },
+ },
+ conversation_settings={
+ 'confirmation_mode': True,
+ 'security_analyzer': 'llm',
+ 'max_iterations': 42,
+ },
+ )
+
+ kwargs = OrgMemberStore.get_kwargs_from_user_settings(user_settings)
+
+ assert kwargs['llm_api_key'] == 'legacy-secret'
+ assert kwargs['agent_settings_diff']['agent'] == 'CodeActAgent'
+ assert (
+ kwargs['agent_settings_diff']['llm']['model']
+ == 'anthropic/claude-sonnet-4-5-20250929'
+ )
+ assert kwargs['agent_settings_diff']['llm']['base_url'] == 'https://api.example.com'
+ assert kwargs['agent_settings_diff']['condenser']['enabled'] is False
+ assert kwargs['agent_settings_diff']['condenser']['max_size'] == 128
+ assert kwargs['conversation_settings_diff']['confirmation_mode'] is True
+ assert kwargs['conversation_settings_diff']['security_analyzer'] == 'llm'
+ assert kwargs['conversation_settings_diff']['max_iterations'] == 42
+
+
+def test_get_kwargs_from_settings_starts_members_without_agent_setting_overrides():
+ settings = Settings()
+ settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'base_url': 'https://api.example.com',
+ 'api_key': 'member-secret',
+ },
+ },
+ 'conversation_settings': {
+ 'max_iterations': 42,
+ 'confirmation_mode': True,
+ },
+ }
+ )
+
+ kwargs = OrgMemberStore.get_kwargs_from_settings(settings)
+
+ assert kwargs['llm_api_key'].get_secret_value() == 'member-secret'
+ assert kwargs['agent_settings_diff'] == {}
@pytest.fixture
@@ -271,16 +336,23 @@ async def test_add_user_to_org_with_llm_settings(async_session_maker):
role_id=role_id,
llm_api_key='test-api-key',
status='active',
- llm_model='claude-sonnet-4',
- llm_base_url='https://api.example.com',
- max_iterations=50,
+ agent_settings_diff={
+ 'schema_version': 1,
+ 'llm': {
+ 'model': 'claude-sonnet-4',
+ 'base_url': 'https://api.example.com',
+ },
+ 'max_iterations': 50,
+ },
)
# Assert
assert org_member is not None
- assert org_member.llm_model == 'claude-sonnet-4'
- assert org_member.llm_base_url == 'https://api.example.com'
- assert org_member.max_iterations == 50
+ assert org_member.agent_settings_diff['llm']['model'] == 'claude-sonnet-4'
+ assert (
+ org_member.agent_settings_diff['llm']['base_url'] == 'https://api.example.com'
+ )
+ assert org_member.agent_settings_diff['max_iterations'] == 50
@pytest.mark.asyncio
@@ -977,8 +1049,11 @@ async def test_update_all_members_llm_settings_async_with_non_encrypted_fields(
user_id=user.id,
role_id=role.id,
llm_api_key='test-key',
- llm_model='old-model',
- max_iterations=10,
+ agent_settings_diff={
+ 'schema_version': 1,
+ 'llm': {'model': 'old-model'},
+ 'max_iterations': 10,
+ },
status='active',
)
session.add(org_member)
@@ -987,9 +1062,13 @@ async def test_update_all_members_llm_settings_async_with_non_encrypted_fields(
# Act
member_settings = OrgMemberLLMSettings(
- llm_model='new-model',
- llm_base_url='https://new-url.com',
- max_iterations=50,
+ agent_settings_diff={
+ 'llm': {
+ 'model': 'new-model',
+ 'base_url': 'https://new-url.com',
+ },
+ 'max_iterations': 50,
+ }
)
async with async_session_maker() as session:
@@ -1007,9 +1086,12 @@ async def test_update_all_members_llm_settings_async_with_non_encrypted_fields(
)
updated_member = result.scalars().first()
- assert updated_member.llm_model == 'new-model'
- assert updated_member.llm_base_url == 'https://new-url.com'
- assert updated_member.max_iterations == 50
+ assert updated_member.agent_settings_diff['llm']['model'] == 'new-model'
+ assert (
+ updated_member.agent_settings_diff['llm']['base_url']
+ == 'https://new-url.com'
+ )
+ assert updated_member.agent_settings_diff['max_iterations'] == 50
@pytest.mark.asyncio
@@ -1042,7 +1124,10 @@ async def test_update_all_members_llm_settings_async_with_empty_settings(
user_id=user.id,
role_id=role.id,
llm_api_key='original-key',
- llm_model='original-model',
+ agent_settings_diff={
+ 'schema_version': 1,
+ 'llm': {'model': 'original-model'},
+ },
status='active',
)
session.add(org_member)
@@ -1067,7 +1152,7 @@ async def test_update_all_members_llm_settings_async_with_empty_settings(
)
member = result.scalars().first()
- assert member.llm_model == 'original-model'
+ assert member.agent_settings_diff['llm']['model'] == 'original-model'
# Original key should still be there (encrypted)
assert member._llm_api_key is not None
@@ -1113,11 +1198,11 @@ def test_org_member_llm_settings_has_updates_empty():
assert result is False
-def test_org_llm_settings_update_apply_to_org_skips_llm_api_key():
+def test_org_llm_settings_update_apply_to_org_updates_secret_fields():
"""
- GIVEN: OrgLLMSettingsUpdate with llm_api_key and other fields set
+ GIVEN: OrgLLMSettingsUpdate with search_api_key and llm_api_key set
WHEN: apply_to_org() is called
- THEN: llm_api_key is NOT applied to org, but other fields are
+ THEN: both org-managed secret fields are applied to the org
"""
from unittest.mock import MagicMock
@@ -1125,22 +1210,19 @@ def test_org_llm_settings_update_apply_to_org_skips_llm_api_key():
# Arrange
settings = OrgLLMSettingsUpdate(
- default_llm_model='claude-3',
- llm_api_key='should-not-be-applied',
+ search_api_key='applied-to-org',
+ llm_api_key='applied-to-org-llm-key',
)
mock_org = MagicMock()
- mock_org.default_llm_model = None
+ mock_org.search_api_key = None
+ mock_org.llm_api_key = None
# Act
settings.apply_to_org(mock_org)
# Assert
- assert mock_org.default_llm_model == 'claude-3'
- # llm_api_key should NOT be set on org (it's member-only)
- assert (
- not hasattr(mock_org, 'llm_api_key')
- or mock_org.llm_api_key != 'should-not-be-applied'
- )
+ assert mock_org.search_api_key == 'applied-to-org'
+ assert mock_org.llm_api_key == 'applied-to-org-llm-key'
def test_org_llm_settings_update_get_member_updates_includes_llm_api_key():
@@ -1153,7 +1235,7 @@ def test_org_llm_settings_update_get_member_updates_includes_llm_api_key():
# Arrange
settings = OrgLLMSettingsUpdate(
- default_llm_model='claude-3',
+ agent_settings_diff={'llm': {'model': 'claude-3'}},
llm_api_key='new-member-key',
)
@@ -1163,7 +1245,7 @@ def test_org_llm_settings_update_get_member_updates_includes_llm_api_key():
# Assert
assert member_updates is not None
assert member_updates.llm_api_key == 'new-member-key'
- assert member_updates.llm_model == 'claude-3'
+ assert member_updates.agent_settings_diff is None
def test_org_llm_settings_update_get_member_updates_only_llm_api_key():
@@ -1183,7 +1265,7 @@ def test_org_llm_settings_update_get_member_updates_only_llm_api_key():
# Assert
assert member_updates is not None
assert member_updates.llm_api_key == 'member-key-only'
- assert member_updates.llm_model is None
+ assert member_updates.agent_settings_diff is None
def test_org_llm_settings_update_has_updates_with_llm_api_key():
diff --git a/enterprise/tests/unit/test_org_service.py b/enterprise/tests/unit/test_org_service.py
index 0ddd225f5e..9d2fdd253d 100644
--- a/enterprise/tests/unit/test_org_service.py
+++ b/enterprise/tests/unit/test_org_service.py
@@ -139,7 +139,12 @@ async def test_create_org_with_owner_success(
),
patch(
'storage.org_service.OrgStore.get_kwargs_from_settings',
- return_value={},
+ return_value={
+ 'agent_settings': {
+ 'llm': {'model': 'anthropic/claude-sonnet-4-5-20250929'},
+ },
+ 'conversation_settings': {},
+ },
),
patch(
'storage.org_service.OrgMemberStore.get_kwargs_from_settings',
@@ -160,7 +165,10 @@ async def test_create_org_with_owner_success(
assert result.contact_name == contact_name
assert result.contact_email == contact_email
assert result.org_version > 0 # Should be set to ORG_SETTINGS_VERSION
- assert result.default_llm_model is not None # Should be set
+ assert (
+ result.agent_settings['llm']['model']
+ == 'anthropic/claude-sonnet-4-5-20250929'
+ )
# Verify organization was persisted
with session_maker() as session:
@@ -1192,8 +1200,12 @@ async def test_update_org_with_permissions_success_llm_fields_admin(
from server.routes.org_models import OrgUpdate
update_data = OrgUpdate(
- default_llm_model='claude-opus-4-5-20251101',
- default_llm_base_url='https://api.anthropic.com',
+ agent_settings_diff={
+ 'llm': {
+ 'model': 'claude-opus-4-5-20251101',
+ 'base_url': 'https://api.anthropic.com',
+ },
+ }
)
with (
@@ -1210,8 +1222,8 @@ async def test_update_org_with_permissions_success_llm_fields_admin(
# Assert
assert result is not None
- assert result.default_llm_model == 'claude-opus-4-5-20251101'
- assert result.default_llm_base_url == 'https://api.anthropic.com'
+ assert result.agent_settings['llm']['model'] == 'claude-opus-4-5-20251101'
+ assert result.agent_settings['llm']['base_url'] == 'https://api.anthropic.com'
@pytest.mark.asyncio
@@ -1254,8 +1266,12 @@ async def test_update_org_with_permissions_success_llm_fields_owner(
from server.routes.org_models import OrgUpdate
update_data = OrgUpdate(
- default_llm_model='claude-opus-4-5-20251101',
- security_analyzer='enabled',
+ agent_settings_diff={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ },
+ conversation_settings_diff={
+ 'security_analyzer': 'llm',
+ },
)
with (
@@ -1272,8 +1288,8 @@ async def test_update_org_with_permissions_success_llm_fields_owner(
# Assert
assert result is not None
- assert result.default_llm_model == 'claude-opus-4-5-20251101'
- assert result.security_analyzer == 'enabled'
+ assert result.agent_settings['llm']['model'] == 'claude-opus-4-5-20251101'
+ assert result.conversation_settings['security_analyzer'] == 'llm'
@pytest.mark.asyncio
@@ -1317,7 +1333,7 @@ async def test_update_org_with_permissions_success_mixed_fields_admin(
update_data = OrgUpdate(
contact_name='Jane Doe',
- default_llm_model='claude-opus-4-5-20251101',
+ agent_settings_diff={'llm': {'model': 'claude-opus-4-5-20251101'}},
conversation_expiration=30,
)
@@ -1336,7 +1352,7 @@ async def test_update_org_with_permissions_success_mixed_fields_admin(
# Assert
assert result is not None
assert result.contact_name == 'Jane Doe'
- assert result.default_llm_model == 'claude-opus-4-5-20251101'
+ assert result.agent_settings['llm']['model'] == 'claude-opus-4-5-20251101'
assert result.conversation_expiration == 30
@@ -1520,7 +1536,9 @@ async def test_update_org_with_permissions_llm_fields_insufficient_permission(
from server.routes.org_models import OrgUpdate
- update_data = OrgUpdate(default_llm_model='claude-opus-4-5-20251101')
+ update_data = OrgUpdate(
+ agent_settings_diff={'llm': {'model': 'claude-opus-4-5-20251101'}}
+ )
with (
patch('storage.org_store.a_session_maker', async_session_maker),
@@ -1763,9 +1781,13 @@ async def test_update_org_with_permissions_only_llm_fields(
from server.routes.org_models import OrgUpdate
update_data = OrgUpdate(
- default_llm_model='claude-opus-4-5-20251101',
- security_analyzer='enabled',
- agent='agent-mode',
+ agent_settings_diff={
+ 'llm': {'model': 'claude-opus-4-5-20251101'},
+ 'agent': 'agent-mode',
+ },
+ conversation_settings_diff={
+ 'security_analyzer': 'llm',
+ },
)
with (
@@ -1782,9 +1804,9 @@ async def test_update_org_with_permissions_only_llm_fields(
# Assert
assert result is not None
- assert result.default_llm_model == 'claude-opus-4-5-20251101'
- assert result.security_analyzer == 'enabled'
- assert result.agent == 'agent-mode'
+ assert result.agent_settings['llm']['model'] == 'claude-opus-4-5-20251101'
+ assert result.conversation_settings['security_analyzer'] == 'llm'
+ assert result.agent_settings['agent'] == 'agent-mode'
@pytest.mark.asyncio
diff --git a/enterprise/tests/unit/test_org_store.py b/enterprise/tests/unit/test_org_store.py
index 0c8a8173f9..b31423e94c 100644
--- a/enterprise/tests/unit/test_org_store.py
+++ b/enterprise/tests/unit/test_org_store.py
@@ -3,7 +3,6 @@ from contextlib import asynccontextmanager
from unittest.mock import AsyncMock, MagicMock, patch
import pytest
-from pydantic import SecretStr
from sqlalchemy import select
from sqlalchemy.exc import IntegrityError
from storage.org import Org
@@ -13,6 +12,7 @@ from storage.org_store import OrgStore
from storage.role import Role
from storage.user import User
+from openhands.sdk.settings import AgentSettings
from openhands.storage.data_models.settings import Settings
@@ -97,7 +97,10 @@ async def test_update_org(async_session_maker, mock_litellm_api):
# Test updating org details
async with async_session_maker() as session:
# Create a test org
- org = Org(name='test-org', agent='CodeActAgent')
+ org = Org(
+ name='test-org',
+ agent_settings=AgentSettings(agent='CodeActAgent'),
+ )
session.add(org)
await session.commit()
await session.refresh(org)
@@ -108,12 +111,16 @@ async def test_update_org(async_session_maker, mock_litellm_api):
patch('storage.org_store.a_session_maker', async_session_maker),
):
updated_org = await OrgStore.update_org(
- org_id=org_id, kwargs={'name': 'updated-org', 'agent': 'PlannerAgent'}
+ org_id=org_id,
+ kwargs={
+ 'name': 'updated-org',
+ 'agent_settings_diff': {'agent': 'PlannerAgent'},
+ },
)
assert updated_org is not None
assert updated_org.name == 'updated-org'
- assert updated_org.agent == 'PlannerAgent'
+ assert updated_org.agent_settings['agent'] == 'PlannerAgent'
@pytest.mark.asyncio
@@ -135,12 +142,15 @@ async def test_create_org(async_session_maker, mock_litellm_api):
patch('storage.org_store.a_session_maker', async_session_maker),
):
org = await OrgStore.create_org(
- kwargs={'name': 'new-org', 'agent': 'CodeActAgent'}
+ kwargs={
+ 'name': 'new-org',
+ 'agent_settings': AgentSettings(agent='CodeActAgent'),
+ }
)
assert org is not None
assert org.name == 'new-org'
- assert org.agent == 'CodeActAgent'
+ assert org.agent_settings['agent'] == 'CodeActAgent'
assert org.id is not None
@@ -274,21 +284,32 @@ async def test_get_current_org_from_keycloak_user_id(
def test_get_kwargs_from_settings():
# Test extracting org kwargs from settings
- settings = Settings(
- language='es',
- agent='CodeActAgent',
- llm_model='gpt-4',
- llm_api_key=SecretStr('test-key'),
- enable_sound_notifications=True,
+ settings = Settings()
+ settings.update(
+ {
+ 'language': 'es',
+ 'enable_sound_notifications': True,
+ 'agent_settings': {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'api_key': 'test-key',
+ },
+ },
+ }
)
kwargs = OrgStore.get_kwargs_from_settings(settings)
# Should only include fields that exist in Org model
- assert 'agent' in kwargs
- assert 'default_llm_model' in kwargs
- assert kwargs['agent'] == 'CodeActAgent'
- assert kwargs['default_llm_model'] == 'gpt-4'
+ assert 'agent_settings' in kwargs
+ assert 'agent' not in kwargs
+ assert 'default_llm_model' not in kwargs
+ assert kwargs['agent_settings']['agent'] == 'CodeActAgent'
+ assert (
+ kwargs['agent_settings']['llm']['model']
+ == 'anthropic/claude-sonnet-4-5-20250929'
+ )
# Should not include fields that don't exist in Org model
assert 'language' not in kwargs # language is not in Org model
assert 'llm_api_key' not in kwargs
@@ -379,7 +400,7 @@ async def test_persist_org_with_owner_returns_refreshed_org(
name='Test Org',
contact_name='Jane Doe',
contact_email='[email protected]',
- agent='CodeActAgent',
+ agent_settings=AgentSettings(agent='CodeActAgent'),
)
org_member = OrgMember(
@@ -397,7 +418,7 @@ async def test_persist_org_with_owner_returns_refreshed_org(
# Assert - verify the returned object has database-generated fields
assert result.id == org_id
assert result.name == 'Test Org'
- assert result.agent == 'CodeActAgent'
+ assert result.agent_settings['agent'] == 'CodeActAgent'
# Verify org_version was set by create_org logic (if applicable)
assert hasattr(result, 'org_version')
@@ -480,9 +501,7 @@ async def test_persist_org_with_owner_with_multiple_fields(
name='Complex Org',
contact_name='Alice Smith',
contact_email='[email protected]',
- agent='CodeActAgent',
- default_max_iterations=50,
- confirmation_mode=True,
+ agent_settings=AgentSettings(agent='CodeActAgent'),
billing_margin=0.15,
)
@@ -492,8 +511,12 @@ async def test_persist_org_with_owner_with_multiple_fields(
role_id=1,
status='active',
llm_api_key='test-key',
- max_iterations=100,
- llm_model='gpt-4',
+ agent_settings_diff={
+ 'llm': {'model': 'gpt-4'},
+ },
+ conversation_settings_diff={
+ 'max_iterations': 100,
+ },
)
# Act
@@ -502,25 +525,21 @@ async def test_persist_org_with_owner_with_multiple_fields(
# Assert
assert result.name == 'Complex Org'
- assert result.agent == 'CodeActAgent'
- assert result.default_max_iterations == 50
- assert result.confirmation_mode is True
+ assert result.agent_settings['agent'] == 'CodeActAgent'
assert result.billing_margin == 0.15
# Verify persistence
async with async_session_maker() as session:
persisted_org = await session.get(Org, org_id)
- assert persisted_org.agent == 'CodeActAgent'
- assert persisted_org.default_max_iterations == 50
- assert persisted_org.confirmation_mode is True
+ assert persisted_org.agent_settings['agent'] == 'CodeActAgent'
assert persisted_org.billing_margin == 0.15
result_query = await session.execute(
select(OrgMember).filter_by(org_id=org_id, user_id=user_id)
)
persisted_member = result_query.scalars().first()
- assert persisted_member.max_iterations == 100
- assert persisted_member.llm_model == 'gpt-4'
+ assert persisted_member.conversation_settings_diff['max_iterations'] == 100
+ assert persisted_member.agent_settings_diff['llm']['model'] == 'gpt-4'
@pytest.mark.asyncio
@@ -1030,11 +1049,11 @@ async def test_update_org_llm_settings_async_with_llm_api_key():
mock_org = Org(
id=org_id,
name='Test Organization',
- default_llm_model='old-model',
+ agent_settings=AgentSettings(llm={'model': 'old-model'}),
)
llm_settings = OrgLLMSettingsUpdate(
- default_llm_model='new-model',
+ agent_settings_diff={'llm': {'model': 'new-model'}},
llm_api_key='new-member-api-key',
)
@@ -1062,14 +1081,14 @@ async def test_update_org_llm_settings_async_with_llm_api_key():
# Assert - Org is returned
assert result is not None
- assert result.default_llm_model == 'new-model'
+ assert result.agent_settings['llm']['model'] == 'new-model'
# Assert - Member update was called with correct settings
mock_member_update.assert_called_once()
call_args = mock_member_update.call_args
member_settings = call_args[0][2] # Third positional arg is member_settings
assert member_settings.llm_api_key == 'new-member-api-key'
- assert member_settings.llm_model == 'new-model'
+ assert member_settings.agent_settings_diff is None
@pytest.mark.asyncio
@@ -1083,7 +1102,9 @@ async def test_update_org_llm_settings_async_org_not_found():
# Arrange
non_existent_org_id = uuid.uuid4()
- llm_settings = OrgLLMSettingsUpdate(default_llm_model='new-model')
+ llm_settings = OrgLLMSettingsUpdate(
+ agent_settings_diff={'llm': {'model': 'new-model'}}
+ )
# Mock the async session to return None for org
mock_session = AsyncMock()
diff --git a/enterprise/tests/unit/test_saas_settings_store.py b/enterprise/tests/unit/test_saas_settings_store.py
index e7583e388d..65163e953b 100644
--- a/enterprise/tests/unit/test_saas_settings_store.py
+++ b/enterprise/tests/unit/test_saas_settings_store.py
@@ -8,11 +8,67 @@ from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.server.settings import Settings
from openhands.storage.data_models.settings import Settings as DataSettings
+
+def _agent_value(settings: Settings, key: str):
+ """Navigate into settings.agent_settings using a dot-separated key."""
+ obj = settings.agent_settings
+ for part in key.split('.'):
+ obj = getattr(obj, part)
+ return obj
+
+
+def _secret_value(settings: Settings, key: str):
+ """Navigate into settings.agent_settings and unwrap SecretStr values."""
+ secret = _agent_value(settings, key)
+ return secret.get_secret_value() if secret else None
+
+
+def _make_settings(
+ model: str | None = None,
+ base_url: str | None = None,
+ api_key: str | None = None,
+ max_iterations: int | None = None,
+ agent: str | None = None,
+ language: str | None = None,
+ **extra_agent: object,
+) -> DataSettings:
+ """Build a DataSettings with the new nested agent_settings API."""
+ top_level: dict = {}
+ if language is not None:
+ top_level['language'] = language
+ s = DataSettings(**top_level)
+ llm: dict = {}
+ if model is not None:
+ llm['model'] = model
+ if base_url is not None:
+ llm['base_url'] = base_url
+ if api_key is not None:
+ llm['api_key'] = api_key
+ agent_settings: dict = {}
+ if agent is not None:
+ agent_settings['agent'] = agent
+ if llm:
+ agent_settings['llm'] = llm
+ agent_settings.update(extra_agent)
+ payload: dict = {}
+ if agent_settings:
+ payload['agent_settings'] = agent_settings
+ conv: dict = {}
+ if max_iterations is not None:
+ conv['max_iterations'] = max_iterations
+ if conv:
+ payload['conversation_settings'] = conv
+ if payload:
+ s.update(payload)
+ return s
+
+
# Mock the database module before importing
with patch('storage.database.a_session_maker'):
from server.constants import (
LITE_LLM_API_URL,
)
+ from storage.encrypt_utils import decrypt_legacy_value, encrypt_legacy_value
from storage.saas_settings_store import SaasSettingsStore
from storage.user_settings import UserSettings
@@ -26,6 +82,42 @@ def mock_config():
return config
+def test_member_settings_persist_full_effective_agent_settings(mock_config):
+ settings = Settings()
+ settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'base_url': 'https://api.example.com',
+ },
+ 'condenser': {
+ 'enabled': False,
+ 'max_size': 128,
+ },
+ },
+ 'conversation_settings': {
+ 'max_iterations': 42,
+ 'confirmation_mode': True,
+ 'security_analyzer': 'llm',
+ },
+ }
+ )
+
+ agent = settings.agent_settings
+ assert agent.agent == 'CodeActAgent'
+ assert agent.llm.model == 'anthropic/claude-sonnet-4-5-20250929'
+ assert agent.llm.base_url == 'https://api.example.com'
+ assert agent.condenser.enabled is False
+ assert agent.condenser.max_size == 128
+
+ # Conversation settings live on the Settings object, not in agent_settings
+ assert settings.conversation_settings.max_iterations == 42
+ assert settings.conversation_settings.confirmation_mode is True
+ assert settings.conversation_settings.security_analyzer == 'llm'
+
+
@pytest.fixture
def settings_store(async_session_maker, mock_config):
store = SaasSettingsStore('5594c7b6-f959-4b81-92e9-b09c206f5081', mock_config)
@@ -44,25 +136,31 @@ def settings_store(async_session_maker, mock_config):
user_settings = result.scalars().first()
if not user_settings:
# Return default settings
- return Settings(
- llm_api_key=SecretStr('test_api_key'),
- llm_base_url='http://test.url',
+ return _make_settings(
+ model='anthropic/claude-sonnet-4-5-20250929',
+ api_key='test_api_key',
+ base_url='http://test.url',
agent='CodeActAgent',
language='en',
)
- # Decrypt and convert to Settings
- kwargs = {}
- for column in UserSettings.__table__.columns:
- if column.name != 'keycloak_user_id':
- value = getattr(user_settings, column.name, None)
- if value is not None:
- kwargs[column.name] = value
-
- store._decrypt_kwargs(kwargs)
- settings = Settings(**kwargs)
- settings.email = '[email protected]'
- settings.email_verified = True
+ # Decrypt and reconstruct Settings
+ agent_dict = user_settings.agent_settings or {}
+ # Decrypt llm_api_key into agent_settings.llm.api_key
+ if user_settings.llm_api_key:
+ decrypted = decrypt_legacy_value(user_settings.llm_api_key)
+ agent_dict.setdefault('llm', {})['api_key'] = decrypted
+
+ settings = Settings(
+ language=user_settings.language,
+ email_verified=True,
+ )
+ payload: dict = {}
+ if agent_dict:
+ payload['agent_settings'] = agent_dict
+ if payload:
+ settings.update(payload)
return settings
# Patch the store method to write to UserSettings table directly (for testing)
@@ -70,6 +168,7 @@ def settings_store(async_session_maker, mock_config):
if item:
# Make a copy of the item without email and email_verified
item_dict = item.model_dump(context={'expose_secrets': True})
+ item_dict['llm_api_key'] = _secret_value(item, 'llm.api_key')
if 'email' in item_dict:
del item_dict['email']
if 'email_verified' in item_dict:
@@ -78,7 +177,13 @@ def settings_store(async_session_maker, mock_config):
del item_dict['secrets_store']
# Encrypt the data before storing
- store._encrypt_kwargs(item_dict)
+ for key in ('llm_api_key', 'search_api_key', 'sandbox_api_key'):
+ value = item_dict.get(key)
+ if value is not None:
+ item_dict[key] = encrypt_legacy_value(value)
+ item_dict['agent_settings'] = item.agent_settings.model_dump(
+ mode='json', exclude_none=True
+ )
# Continue with the original implementation
from sqlalchemy import select
@@ -113,21 +218,36 @@ def settings_store(async_session_maker, mock_config):
async def test_store_and_load_keycloak_user(settings_store):
# Set a UUID-like Keycloak user ID
settings_store.user_id = '550e8400-e29b-41d4-a716-446655440000'
- settings = Settings(
- llm_api_key=SecretStr('secret_key'),
- llm_base_url=LITE_LLM_API_URL,
- agent='smith',
+ settings = DataSettings(
email_verified=True,
)
+ settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'smith',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'api_key': 'secret_key',
+ 'base_url': LITE_LLM_API_URL,
+ },
+ 'verification': {
+ 'critic_mode': 'all_actions',
+ 'critic_enabled': True,
+ },
+ },
+ }
+ )
await settings_store.store(settings)
# Load and verify settings
loaded_settings = await settings_store.load()
assert loaded_settings is not None
- assert loaded_settings.llm_api_key.get_secret_value() == 'secret_key'
- assert loaded_settings.agent == 'smith'
+ assert _agent_value(loaded_settings, 'verification.critic_mode') == 'all_actions'
+ assert _agent_value(loaded_settings, 'verification.critic_enabled') is True
+ assert _secret_value(loaded_settings, 'llm.api_key') == 'secret_key'
+ assert _agent_value(loaded_settings, 'agent') == 'smith'
# Verify it was stored in user_settings table with keycloak_user_id
from sqlalchemy import select
@@ -140,7 +260,7 @@ async def test_store_and_load_keycloak_user(settings_store):
)
stored = result.scalars().first()
assert stored is not None
- assert stored.agent == 'smith'
+ assert stored.agent_settings['agent'] == 'smith'
@pytest.mark.asyncio
@@ -154,21 +274,30 @@ async def test_load_returns_default_when_not_found(settings_store, async_session
loaded_settings = await settings_store.load()
assert loaded_settings is not None
assert loaded_settings.language == 'en'
- assert loaded_settings.agent == 'CodeActAgent'
- assert loaded_settings.llm_api_key.get_secret_value() == 'test_api_key'
- assert loaded_settings.llm_base_url == 'http://test.url'
+ assert _agent_value(loaded_settings, 'agent') == 'CodeActAgent'
+ assert _secret_value(loaded_settings, 'llm.api_key') == 'test_api_key'
+ assert _agent_value(loaded_settings, 'llm.base_url') == 'http://test.url'
@pytest.mark.asyncio
async def test_encryption(settings_store):
settings_store.user_id = '5594c7b6-f959-4b81-92e9-b09c206f5081' # GitHub user ID
- settings = Settings(
- llm_api_key=SecretStr('secret_key'),
- agent='smith',
- llm_base_url=LITE_LLM_API_URL,
+ settings = DataSettings(
email_verified=True,
)
+ settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'smith',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'api_key': 'secret_key',
+ 'base_url': LITE_LLM_API_URL,
+ },
+ },
+ }
+ )
await settings_store.store(settings)
from sqlalchemy import select
@@ -183,7 +312,7 @@ async def test_encryption(settings_store):
assert stored.llm_api_key != 'secret_key'
# But we should be able to decrypt it when loading
loaded_settings = await settings_store.load()
- assert loaded_settings.llm_api_key.get_secret_value() == 'secret_key'
+ assert _secret_value(loaded_settings, 'llm.api_key') == 'secret_key'
@pytest.mark.asyncio
@@ -191,9 +320,7 @@ async def test_ensure_api_key_keeps_valid_key(mock_config):
"""When the existing key is valid, it should be kept unchanged."""
store = SaasSettingsStore('test-user-id-123', mock_config)
existing_key = 'sk-existing-key'
- item = DataSettings(
- llm_model='openhands/gpt-4', llm_api_key=SecretStr(existing_key)
- )
+ item = _make_settings(model='openhands/gpt-4', api_key=existing_key)
with patch(
'storage.saas_settings_store.LiteLlmManager.verify_existing_key',
@@ -203,8 +330,8 @@ async def test_ensure_api_key_keeps_valid_key(mock_config):
await store._ensure_api_key(item, 'org-123', openhands_type=True)
# Key should remain unchanged when it's valid
- assert item.llm_api_key is not None
- assert item.llm_api_key.get_secret_value() == existing_key
+ assert _secret_value(item, 'llm.api_key') is not None
+ assert _secret_value(item, 'llm.api_key') == existing_key
@pytest.mark.asyncio
@@ -214,9 +341,7 @@ async def test_ensure_api_key_generates_new_key_when_verification_fails(
"""When verification fails, a new key should be generated."""
store = SaasSettingsStore('test-user-id-123', mock_config)
new_key = 'sk-new-key'
- item = DataSettings(
- llm_model='openhands/gpt-4', llm_api_key=SecretStr('sk-invalid-key')
- )
+ item = _make_settings(model='openhands/gpt-4', api_key='sk-invalid-key')
with (
patch(
@@ -232,8 +357,8 @@ async def test_ensure_api_key_generates_new_key_when_verification_fails(
):
await store._ensure_api_key(item, 'org-123', openhands_type=True)
- assert item.llm_api_key is not None
- assert item.llm_api_key.get_secret_value() == new_key
+ assert _secret_value(item, 'llm.api_key') is not None
+ assert _secret_value(item, 'llm.api_key') == new_key
@pytest.fixture
@@ -264,7 +389,6 @@ def org_with_multiple_members_fixture(session_maker):
id=org_id,
name='test-org',
org_version=1,
- enable_default_condenser=True,
enable_proactive_conversation_starters=True,
)
session.add(org)
@@ -291,9 +415,10 @@ def org_with_multiple_members_fixture(session_maker):
user_id=admin_user_id,
role_id=10,
llm_api_key='admin-initial-key',
- llm_model='old-model-v1',
- llm_base_url='http://old-url-1.com',
- max_iterations=10,
+ agent_settings_diff={
+ 'llm': {'model': 'old-model-v1', 'base_url': 'http://old-url-1.com'},
+ },
+ conversation_settings_diff={'max_iterations': 10},
status='active',
)
session.add(admin_member)
@@ -303,9 +428,10 @@ def org_with_multiple_members_fixture(session_maker):
user_id=member1_user_id,
role_id=10,
llm_api_key='member1-initial-key',
- llm_model='old-model-v2',
- llm_base_url='http://old-url-2.com',
- max_iterations=20,
+ agent_settings_diff={
+ 'llm': {'model': 'old-model-v2', 'base_url': 'http://old-url-2.com'},
+ },
+ conversation_settings_diff={'max_iterations': 20},
status='active',
)
session.add(member1)
@@ -315,9 +441,10 @@ def org_with_multiple_members_fixture(session_maker):
user_id=member2_user_id,
role_id=10,
llm_api_key='member2-initial-key',
- llm_model='old-model-v3',
- llm_base_url='http://old-url-3.com',
- max_iterations=30,
+ agent_settings_diff={
+ 'llm': {'model': 'old-model-v3', 'base_url': 'http://old-url-3.com'},
+ },
+ conversation_settings_diff={'max_iterations': 30},
status='active',
)
session.add(member2)
@@ -334,205 +461,193 @@ def org_with_multiple_members_fixture(session_maker):
@pytest.mark.asyncio
-async def test_store_propagates_llm_settings_to_all_org_members(
+async def test_store_updates_org_defaults_and_all_members_for_shared_keys(
session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When admin saves LLM settings, all org members should receive the updated settings.
-
- This test verifies using a real database that:
- 1. The bulk UPDATE targets the correct organization (WHERE clause is correct)
- 2. All LLM fields are correctly set (llm_model, llm_base_url, max_iterations, llm_api_key)
- 3. The llm_api_key is properly encrypted
- 4. All members in the org receive the same updated values
- """
+ """External provider keys should still sync as an org-wide shared snapshot."""
from sqlalchemy import select
+ from storage.org import Org
from storage.org_member import OrgMember
- # Arrange
fixture = org_with_multiple_members_fixture
org_id = fixture['org_id']
- admin_user_id = str(fixture['admin_user_id'])
decrypt_value = fixture['decrypt_value']
- store = SaasSettingsStore(admin_user_id, mock_config)
-
- new_settings = DataSettings(
- llm_model='new-shared-model/gpt-4',
- llm_base_url='http://new-shared-url.com',
+ store = SaasSettingsStore(str(fixture['admin_user_id']), mock_config)
+ new_settings = _make_settings(
+ model='anthropic/claude-sonnet-4',
+ base_url='https://api.anthropic.com/v1',
max_iterations=100,
- llm_api_key=SecretStr('new-shared-api-key'),
+ api_key='shared-external-api-key',
)
- # Act - call store() with async session
with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
await store.store(new_settings)
- # Assert - verify ALL org members have the updated LLM settings using sync session
with session_maker() as session:
- result = session.execute(select(OrgMember).where(OrgMember.org_id == org_id))
- members = result.scalars().all()
-
- # Verify we have all 3 members
- assert len(members) == 3, f'Expected 3 org members, got {len(members)}'
-
- for member in members:
- # Verify LLM model is updated
- assert (
- member.llm_model == 'new-shared-model/gpt-4'
- ), f'Expected llm_model to be updated for member {member.user_id}'
-
- # Verify LLM base URL is updated
- assert (
- member.llm_base_url == 'http://new-shared-url.com'
- ), f'Expected llm_base_url to be updated for member {member.user_id}'
+ org = session.execute(select(Org).where(Org.id == org_id)).scalars().first()
+ assert org is not None
+ assert org.agent_settings['llm']['model'] == 'anthropic/claude-sonnet-4'
+ assert org.agent_settings['llm']['base_url'] == 'https://api.anthropic.com/v1'
+ assert org.conversation_settings['max_iterations'] == 100
+
+ members = {
+ str(member.user_id): member
+ for member in session.execute(
+ select(OrgMember).where(OrgMember.org_id == org_id)
+ )
+ .scalars()
+ .all()
+ }
+ assert len(members) == 3
- # Verify max_iterations is updated
+ for member in members.values():
assert (
- member.max_iterations == 100
- ), f'Expected max_iterations to be 100 for member {member.user_id}'
-
- # Verify the API key is encrypted and decrypts to the correct value
- decrypted_key = decrypt_value(member._llm_api_key)
+ member.agent_settings_diff['llm']['model']
+ == 'anthropic/claude-sonnet-4'
+ )
assert (
- decrypted_key == 'new-shared-api-key'
- ), f'Expected llm_api_key to decrypt to new-shared-api-key for member {member.user_id}'
+ member.agent_settings_diff['llm']['base_url']
+ == 'https://api.anthropic.com/v1'
+ )
+ assert member.conversation_settings_diff['max_iterations'] == 100
+ assert decrypt_value(member._llm_api_key) == 'shared-external-api-key'
@pytest.mark.asyncio
-async def test_store_updates_org_default_llm_settings(
+async def test_store_keeps_openhands_managed_keys_member_specific(
session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When admin saves LLM settings, org's default_llm_model/base_url/max_iterations should be updated.
-
- This test verifies that the Org table's default settings are updated so that
- new members joining later will inherit the correct LLM configuration.
- """
+ """Managed OpenHands keys should not be copied from one member to everyone else."""
from sqlalchemy import select
from storage.org import Org
+ from storage.org_member import OrgMember
- # Arrange
fixture = org_with_multiple_members_fixture
org_id = fixture['org_id']
admin_user_id = str(fixture['admin_user_id'])
+ decrypt_value = fixture['decrypt_value']
store = SaasSettingsStore(admin_user_id, mock_config)
-
- new_settings = DataSettings(
- llm_model='anthropic/claude-sonnet-4',
- llm_base_url='https://api.anthropic.com/v1',
+ new_settings = _make_settings(
+ model='openhands/claude-opus-4-5-20251101',
+ base_url=LITE_LLM_API_URL,
max_iterations=75,
- llm_api_key=SecretStr('test-api-key'),
+ api_key='admin-managed-api-key',
)
- # Act
- with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
+ with (
+ patch('storage.saas_settings_store.a_session_maker', async_session_maker),
+ patch(
+ 'storage.saas_settings_store.LiteLlmManager.verify_existing_key',
+ new_callable=AsyncMock,
+ return_value=True,
+ ),
+ ):
await store.store(new_settings)
- # Assert - verify org's default fields were updated
with session_maker() as session:
- result = session.execute(select(Org).where(Org.id == org_id))
- org = result.scalars().first()
-
+ org = session.execute(select(Org).where(Org.id == org_id)).scalars().first()
assert org is not None
- assert org.default_llm_model == 'anthropic/claude-sonnet-4'
- assert org.default_llm_base_url == 'https://api.anthropic.com/v1'
- assert org.default_max_iterations == 75
-
-
-async def test_store_saves_mcp_config_to_user_org_member_only(
- session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
-):
- """When user saves MCP config, it should be stored ONLY on their org_member, not propagated to others.
-
- This test verifies that MCP settings are user-specific:
- 1. The saving user's org_member.mcp_config is set
- 2. Other members' org_member.mcp_config remains unchanged (NULL)
- """
- from sqlalchemy import select
- from storage.org_member import OrgMember
-
- # Arrange
- fixture = org_with_multiple_members_fixture
- org_id = fixture['org_id']
- admin_user_id = str(fixture['admin_user_id'])
- member1_user_id = fixture['member1_user_id']
- member2_user_id = fixture['member2_user_id']
-
- store = SaasSettingsStore(admin_user_id, mock_config)
-
- user_mcp_config = {
- 'sse_servers': [{'url': 'https://user1-mcp-server.com', 'api_key': None}],
- 'stdio_servers': [],
- 'shttp_servers': [],
- }
-
- new_settings = DataSettings(
- llm_model='test-model',
- llm_base_url='http://non-litellm-url.com', # Non-LiteLLM URL to skip API key verification
- llm_api_key=SecretStr('test-api-key'),
- mcp_config=user_mcp_config,
- )
+ # Settings normalizes openhands/ → litellm_proxy/ during construction
+ assert (
+ org.agent_settings['llm']['model']
+ == 'litellm_proxy/claude-opus-4-5-20251101'
+ )
+ assert org.agent_settings['llm']['base_url'] == LITE_LLM_API_URL
+ assert org.conversation_settings['max_iterations'] == 75
- # Act
- with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
- await store.store(new_settings)
+ members = {
+ str(member.user_id): member
+ for member in session.execute(
+ select(OrgMember).where(OrgMember.org_id == org_id)
+ )
+ .scalars()
+ .all()
+ }
+ assert len(members) == 3
- # Assert
- with session_maker() as session:
- result = session.execute(select(OrgMember).where(OrgMember.org_id == org_id))
- members = {str(m.user_id): m for m in result.scalars().all()}
+ admin_member = members[admin_user_id]
+ assert decrypt_value(admin_member._llm_api_key) == 'admin-managed-api-key'
- # Admin's mcp_config should be set
- assert members[admin_user_id].mcp_config == user_mcp_config
+ member1 = members[str(fixture['member1_user_id'])]
+ member2 = members[str(fixture['member2_user_id'])]
+ assert decrypt_value(member1._llm_api_key) == 'member1-initial-key'
+ assert decrypt_value(member2._llm_api_key) == 'member2-initial-key'
- # Other members' mcp_config should remain NULL (not propagated)
- assert members[str(member1_user_id)].mcp_config is None
- assert members[str(member2_user_id)].mcp_config is None
+ for member in members.values():
+ assert (
+ member.agent_settings_diff['llm']['model']
+ == 'litellm_proxy/claude-opus-4-5-20251101'
+ )
+ assert member.agent_settings_diff['llm']['base_url'] == LITE_LLM_API_URL
+ assert member.conversation_settings_diff['max_iterations'] == 75
@pytest.mark.asyncio
-async def test_store_does_not_update_org_mcp_config(
+async def test_store_saves_mcp_config_in_agent_settings(
session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When user saves MCP config, org.mcp_config should NOT be updated.
-
- MCP settings are user-specific and should be stored on org_member, not org.
- """
+ """mcp_config now flows through agent_settings / agent_settings_diff,
+ so it is persisted on both the org and all members."""
from sqlalchemy import select
from storage.org import Org
+ from storage.org_member import OrgMember
- # Arrange
fixture = org_with_multiple_members_fixture
org_id = fixture['org_id']
admin_user_id = str(fixture['admin_user_id'])
+ member1_user_id = str(fixture['member1_user_id'])
+ member2_user_id = str(fixture['member2_user_id'])
store = SaasSettingsStore(admin_user_id, mock_config)
-
user_mcp_config = {
- 'sse_servers': [{'url': 'https://private-mcp-server.com', 'api_key': None}],
- 'stdio_servers': [],
- 'shttp_servers': [],
+ 'mcpServers': {
+ 'user1': {'url': 'https://user1-mcp-server.com', 'transport': 'sse'}
+ },
}
-
- new_settings = DataSettings(
- llm_model='test-model',
- llm_base_url='http://non-litellm-url.com', # Non-LiteLLM URL to skip API key verification
- llm_api_key=SecretStr('test-api-key'),
- mcp_config=user_mcp_config,
+ new_settings = DataSettings()
+ new_settings.update(
+ {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'test-model',
+ 'base_url': 'http://non-litellm-url.com',
+ 'api_key': 'test-api-key',
+ },
+ 'mcp_config': user_mcp_config,
+ },
+ }
)
- # Act
with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
await store.store(new_settings)
- # Assert - org.mcp_config should remain NULL
with session_maker() as session:
- result = session.execute(select(Org).where(Org.id == org_id))
- org = result.scalars().first()
-
+ org = session.execute(select(Org).where(Org.id == org_id)).scalars().first()
assert org is not None
- assert org.mcp_config is None
+ assert org.agent_settings.get('mcp_config') == user_mcp_config
+
+ members = {
+ str(m.user_id): m
+ for m in session.execute(
+ select(OrgMember).where(OrgMember.org_id == org_id)
+ )
+ .scalars()
+ .all()
+ }
+ assert (
+ members[admin_user_id].agent_settings_diff.get('mcp_config')
+ == user_mcp_config
+ )
+ assert (
+ members[member1_user_id].agent_settings_diff.get('mcp_config')
+ == user_mcp_config
+ )
+ assert (
+ members[member2_user_id].agent_settings_diff.get('mcp_config')
+ == user_mcp_config
+ )
@pytest.mark.asyncio
@@ -545,26 +660,21 @@ async def test_store_skips_ensure_api_key_for_non_openhands_model_without_base_u
This is the primary bug fix: users selecting e.g. OpenAI in basic view and
providing their own API key should not have it overwritten by a proxy key.
"""
- # Arrange
fixture = org_with_multiple_members_fixture
admin_user_id = str(fixture['admin_user_id'])
store = SaasSettingsStore(admin_user_id, mock_config)
- custom_api_key = 'sk-user-custom-openai-key'
- settings = DataSettings(
- llm_model='openai/gpt-5.2',
- llm_base_url=None, # Basic view: no base URL provided
- llm_api_key=SecretStr(custom_api_key),
+ settings = _make_settings(
+ model='openai/gpt-5.2',
+ api_key='sk-user-custom-openai-key',
)
- # Act
with (
patch('storage.saas_settings_store.a_session_maker', async_session_maker),
patch.object(store, '_ensure_api_key', new_callable=AsyncMock) as mock_ensure,
):
await store.store(settings)
- # Assert
mock_ensure.assert_not_called()
@@ -572,31 +682,22 @@ async def test_store_skips_ensure_api_key_for_non_openhands_model_without_base_u
async def test_store_calls_ensure_api_key_for_openhands_model_without_base_url(
session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When saving an OpenHands model with no base URL, _ensure_api_key should
- still be called to generate/verify the proxy key.
-
- This guards the edge case of switching from a non-OpenHands provider to
- OpenHands in basic view, where a stale BYOR key needs to be replaced.
- """
- # Arrange
+ """OpenHands models still require proxy-key verification without a base URL."""
fixture = org_with_multiple_members_fixture
admin_user_id = str(fixture['admin_user_id'])
store = SaasSettingsStore(admin_user_id, mock_config)
- settings = DataSettings(
- llm_model='openhands/claude-opus-4-5-20251101',
- llm_base_url=None,
- llm_api_key=SecretStr('sk-stale-openai-key'),
+ settings = _make_settings(
+ model='openhands/claude-opus-4-5-20251101',
+ api_key='sk-stale-openai-key',
)
- # Act
with (
patch('storage.saas_settings_store.a_session_maker', async_session_maker),
patch.object(store, '_ensure_api_key', new_callable=AsyncMock) as mock_ensure,
):
await store.store(settings)
- # Assert
mock_ensure.assert_called_once()
@@ -604,93 +705,70 @@ async def test_store_calls_ensure_api_key_for_openhands_model_without_base_url(
async def test_store_calls_ensure_api_key_when_base_url_is_litellm_proxy(
session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When the base URL is explicitly the LiteLLM proxy, _ensure_api_key should
- be called regardless of the model type."""
- # Arrange
+ """Explicit LiteLLM proxy usage should always verify/generate the API key."""
fixture = org_with_multiple_members_fixture
admin_user_id = str(fixture['admin_user_id'])
store = SaasSettingsStore(admin_user_id, mock_config)
- settings = DataSettings(
- llm_model='openai/gpt-5.2',
- llm_base_url=LITE_LLM_API_URL,
- llm_api_key=SecretStr('sk-some-key'),
+ settings = _make_settings(
+ model='openai/gpt-5.2',
+ base_url=LITE_LLM_API_URL,
+ api_key='sk-some-key',
)
- # Act
with (
patch('storage.saas_settings_store.a_session_maker', async_session_maker),
patch.object(store, '_ensure_api_key', new_callable=AsyncMock) as mock_ensure,
):
await store.store(settings)
- # Assert
mock_ensure.assert_called_once()
@pytest.mark.asyncio
-async def test_load_returns_user_specific_mcp_config(
- session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
+async def test_store_and_load_mcp_config_via_agent_settings(
+ async_session_maker, mock_config, org_with_multiple_members_fixture
):
- """When loading settings, mcp_config should come from the user's org_member, not from org or other members.
-
- This test verifies user isolation:
- 1. User1 stores their MCP config
- 2. User2 stores a different MCP config
- 3. Loading as User1 returns User1's config (not User2's)
- """
-
- # Arrange
+ """mcp_config is persisted inside agent_settings / agent_settings_diff and
+ round-trips correctly through store → load."""
fixture = org_with_multiple_members_fixture
admin_user_id = str(fixture['admin_user_id'])
- member1_user_id = str(fixture['member1_user_id'])
- user1_mcp_config = {
- 'sse_servers': [{'url': 'https://user1-private-server.com', 'api_key': None}],
- 'stdio_servers': [],
- 'shttp_servers': [],
- }
- user2_mcp_config = {
- 'sse_servers': [{'url': 'https://user2-private-server.com', 'api_key': None}],
- 'stdio_servers': [],
- 'shttp_servers': [],
+ admin_mcp_config = {
+ 'mcpServers': {
+ 'admin': {'url': 'https://admin-private-server.com', 'transport': 'sse'}
+ },
}
- # Store MCP config for user1 (admin)
- store1 = SaasSettingsStore(admin_user_id, mock_config)
- settings1 = DataSettings(
- llm_model='test-model',
- llm_base_url='http://non-litellm-url.com', # Non-LiteLLM URL to skip API key verification
- llm_api_key=SecretStr('test-api-key'),
- mcp_config=user1_mcp_config,
- )
- with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
- await store1.store(settings1)
-
- # Store different MCP config for user2 (member1)
- store2 = SaasSettingsStore(member1_user_id, mock_config)
- settings2 = DataSettings(
- llm_model='test-model',
- llm_base_url='http://non-litellm-url.com', # Non-LiteLLM URL to skip API key verification
- llm_api_key=SecretStr('test-api-key'),
- mcp_config=user2_mcp_config,
+ admin_store = SaasSettingsStore(admin_user_id, mock_config)
+
+ admin_settings = DataSettings()
+ admin_settings.update(
+ {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'test-model',
+ 'base_url': 'http://non-litellm-url.com',
+ 'api_key': 'test-api-key',
+ },
+ 'mcp_config': admin_mcp_config,
+ },
+ }
)
+
with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
- await store2.store(settings2)
+ await admin_store.store(admin_settings)
- # Act - load settings as user1
- # Need to patch all store modules since load() calls UserStore, OrgStore, etc.
- with patch(
- 'storage.saas_settings_store.a_session_maker', async_session_maker
- ), patch('storage.user_store.a_session_maker', async_session_maker), patch(
- 'storage.org_store.a_session_maker', async_session_maker
+ with (
+ patch('storage.saas_settings_store.a_session_maker', async_session_maker),
+ patch('storage.user_store.a_session_maker', async_session_maker),
+ patch('storage.org_store.a_session_maker', async_session_maker),
):
- loaded_settings = await store1.load()
+ loaded = await admin_store.load()
- # Assert - user1 should see their own MCP config, not user2's
- assert loaded_settings is not None
- assert loaded_settings.mcp_config is not None
+ assert loaded is not None
+ assert loaded.agent_settings.mcp_config is not None
assert (
- loaded_settings.mcp_config.sse_servers[0].url
- == 'https://user1-private-server.com'
+ loaded.agent_settings.mcp_config.mcpServers['admin'].url
+ == 'https://admin-private-server.com'
)
diff --git a/enterprise/tests/unit/test_user_store.py b/enterprise/tests/unit/test_user_store.py
index cee7374c5d..ce1ea0c6cb 100644
--- a/enterprise/tests/unit/test_user_store.py
+++ b/enterprise/tests/unit/test_user_store.py
@@ -52,7 +52,16 @@ def test_get_kwargs_from_settings():
settings = Settings(
language='es',
enable_sound_notifications=True,
- llm_api_key=SecretStr('test-key'),
+ )
+ settings.update(
+ {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'api_key': 'test-key',
+ },
+ },
+ }
)
kwargs = UserStore.get_kwargs_from_settings(settings)
@@ -81,11 +90,18 @@ async def test_create_default_settings_with_litellm(mock_litellm_api):
user_id = str(uuid.uuid4())
# Mock LiteLlmManager.create_entries to return a Settings object
- mock_settings = Settings(
- language='en',
- llm_api_key=SecretStr('test_api_key'),
- llm_base_url='http://test.url',
- agent='CodeActAgent',
+ mock_settings = Settings(language='en')
+ mock_settings.update(
+ {
+ 'agent_settings': {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'anthropic/claude-sonnet-4-5-20250929',
+ 'api_key': 'test_api_key',
+ 'base_url': 'http://test.url',
+ },
+ },
+ }
)
with patch(
@@ -97,8 +113,8 @@ async def test_create_default_settings_with_litellm(mock_litellm_api):
# With mock, should return settings with API key from LiteLLM
assert settings is not None
- assert settings.llm_api_key.get_secret_value() == 'test_api_key'
- assert settings.llm_base_url == 'http://test.url'
+ assert settings.agent_settings.llm.api_key.get_secret_value() == 'test_api_key'
+ assert settings.agent_settings.llm.base_url == 'http://test.url'
@pytest.mark.asyncio
@@ -688,8 +704,12 @@ def test_has_custom_settings_custom_base_url():
user_settings = UserSettings(
keycloak_user_id='test',
- llm_base_url='https://custom.api.example.com',
- llm_model='some-model',
+ agent_settings={
+ 'llm': {
+ 'base_url': 'https://custom.api.example.com',
+ 'model': 'some-model',
+ },
+ },
)
result = UserStore._has_custom_settings(user_settings, old_user_version=1)
@@ -701,11 +721,7 @@ def test_has_custom_settings_no_model():
"""Test that no model set means using defaults."""
from storage.user_settings import UserSettings
- user_settings = UserSettings(
- keycloak_user_id='test',
- llm_base_url=None,
- llm_model=None,
- )
+ user_settings = UserSettings(keycloak_user_id='test', agent_settings={})
result = UserStore._has_custom_settings(user_settings, old_user_version=1)
@@ -718,8 +734,7 @@ def test_has_custom_settings_empty_model():
user_settings = UserSettings(
keycloak_user_id='test',
- llm_base_url=None,
- llm_model=' ', # whitespace only
+ agent_settings={'llm': {'model': ' '}},
)
result = UserStore._has_custom_settings(user_settings, old_user_version=1)
@@ -727,6 +742,35 @@ def test_has_custom_settings_empty_model():
assert result is False
+def test_user_settings_byor_secret_property_encrypts_round_trip():
+ from storage.user_settings import UserSettings
+
+ user_settings = UserSettings(keycloak_user_id='test')
+
+ user_settings.llm_api_key_for_byor_secret = SecretStr('sk-byor-secret')
+
+ assert user_settings.llm_api_key_for_byor != 'sk-byor-secret'
+ assert user_settings.llm_api_key_for_byor_secret is not None
+ assert (
+ user_settings.llm_api_key_for_byor_secret.get_secret_value() == 'sk-byor-secret'
+ )
+
+
+def test_user_settings_byor_secret_property_accepts_plaintext_legacy_rows():
+ from storage.user_settings import UserSettings
+
+ user_settings = UserSettings(
+ keycloak_user_id='test',
+ llm_api_key_for_byor='sk-legacy-plaintext',
+ )
+
+ assert user_settings.llm_api_key_for_byor_secret is not None
+ assert (
+ user_settings.llm_api_key_for_byor_secret.get_secret_value()
+ == 'sk-legacy-plaintext'
+ )
+
+
# --- Tests for _create_user_settings_from_entities ---
@@ -737,10 +781,15 @@ def test_create_user_settings_from_entities():
# Create mock entities
org_member = MagicMock()
org_member.llm_api_key = SecretStr('test-api-key')
- org_member.llm_api_key_for_byor = None
- org_member.llm_model = 'claude-3-5-sonnet'
- org_member.llm_base_url = 'https://api.example.com'
- org_member.max_iterations = 50
+ org_member.agent_settings_diff = {
+ 'llm': {
+ 'model': 'claude-3-5-sonnet',
+ 'base_url': 'https://api.example.com',
+ },
+ }
+ org_member.conversation_settings_diff = {
+ 'max_iterations': 50,
+ }
user = MagicMock()
user.accepted_tos = None
@@ -753,26 +802,23 @@ def test_create_user_settings_from_entities():
user.git_user_email = '[email protected]'
org = MagicMock()
- org.agent = 'CodeActAgent'
- org.security_analyzer = 'mock-analyzer'
- org.confirmation_mode = False
org.remote_runtime_resource_factor = 1.0
- org.enable_default_condenser = True
org.billing_margin = 0.0
org.enable_proactive_conversation_starters = True
org.sandbox_base_container_image = None
org.sandbox_runtime_container_image = None
org.org_version = 1
- org.mcp_config = None
+ org.agent_settings = {
+ 'agent': 'CodeActAgent',
+ }
+ org.conversation_settings = {
+ 'security_analyzer': 'llm',
+ }
org.search_api_key = None
org.sandbox_api_key = None
org.max_budget_per_task = None
org.enable_solvability_analysis = False
org.v1_enabled = True
- org.condenser_max_size = None
- org.default_llm_model = 'default-model'
- org.default_llm_base_url = 'https://default.api.com'
- org.default_max_iterations = 100
result = UserStore._create_user_settings_from_entities(
user_id, org_member, user, org
@@ -780,7 +826,11 @@ def test_create_user_settings_from_entities():
assert result.keycloak_user_id == user_id
assert result.llm_api_key == 'test-api-key'
- assert result.llm_model == 'claude-3-5-sonnet'
+ assert result.agent_settings['llm']['model'] == 'claude-3-5-sonnet'
+ assert result.agent_settings['llm']['base_url'] == 'https://api.example.com'
+ assert result.agent_settings['agent'] == 'CodeActAgent'
+ assert result.conversation_settings['security_analyzer'] == 'llm'
+ assert result.conversation_settings['max_iterations'] == 50
assert result.language == 'en'
assert result.email == '[email protected]'
@@ -792,10 +842,8 @@ def test_create_user_settings_from_entities_with_org_fallback():
# Create mock entities with None in OrgMember
org_member = MagicMock()
org_member.llm_api_key = None
- org_member.llm_api_key_for_byor = None
- org_member.llm_model = None # Should fall back to org.default_llm_model
- org_member.llm_base_url = None # Should fall back to org.default_llm_base_url
- org_member.max_iterations = None # Should fall back to org.default_max_iterations
+ org_member.agent_settings_diff = {}
+ org_member.conversation_settings_diff = {}
user = MagicMock()
user.accepted_tos = None
@@ -808,36 +856,44 @@ def test_create_user_settings_from_entities_with_org_fallback():
user.git_user_email = None
org = MagicMock()
- org.agent = 'CodeActAgent'
- org.security_analyzer = None
- org.confirmation_mode = True
org.remote_runtime_resource_factor = 2.0
- org.enable_default_condenser = False
org.billing_margin = 0.1
org.enable_proactive_conversation_starters = False
org.sandbox_base_container_image = 'custom-image'
org.sandbox_runtime_container_image = None
org.org_version = 2
- org.mcp_config = {'key': 'value'}
+ org.agent_settings = {
+ 'agent': 'CodeActAgent',
+ 'llm': {
+ 'model': 'default-model',
+ 'base_url': 'https://default.api.com',
+ },
+ 'condenser': {
+ 'enabled': False,
+ 'max_size': 1000,
+ },
+ }
+ org.conversation_settings = {
+ 'confirmation_mode': True,
+ 'max_iterations': 100,
+ }
org.search_api_key = SecretStr('search-key')
org.sandbox_api_key = None
org.max_budget_per_task = 10.0
org.enable_solvability_analysis = True
org.v1_enabled = False
- org.condenser_max_size = 1000
- # Org defaults
- org.default_llm_model = 'default-model'
- org.default_llm_base_url = 'https://default.api.com'
- org.default_max_iterations = 100
result = UserStore._create_user_settings_from_entities(
user_id, org_member, user, org
)
# Should have fallen back to org defaults
- assert result.llm_model == 'default-model'
- assert result.llm_base_url == 'https://default.api.com'
- assert result.max_iterations == 100
+ assert result.agent_settings['llm']['model'] == 'default-model'
+ assert result.agent_settings['llm']['base_url'] == 'https://default.api.com'
+ assert result.agent_settings['agent'] == 'CodeActAgent'
+ assert result.agent_settings['condenser']['max_size'] == 1000
+ assert result.conversation_settings['confirmation_mode'] is True
+ assert result.conversation_settings['max_iterations'] == 100
assert result.language == 'es'
assert result.search_api_key == 'search-key'
diff --git a/frontend/__tests__/components/features/settings/sdk-settings/schema-field.test.tsx b/frontend/__tests__/components/features/settings/sdk-settings/schema-field.test.tsx
new file mode 100644
index 0000000000..6bfc181b03
--- /dev/null
+++ b/frontend/__tests__/components/features/settings/sdk-settings/schema-field.test.tsx
@@ -0,0 +1,70 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { SchemaField } from "#/components/features/settings/sdk-settings/schema-field";
+import { SettingsFieldSchema } from "#/types/settings";
+
+vi.mock("react-i18next", () => ({
+ useTranslation: () => ({
+ t: (key: string) =>
+ ({
+ SETTINGS$TOP_P_LABEL: "Top P",
+ SETTINGS$TOP_P_DESCRIPTION: "Controls nucleus sampling.",
+ })[key] ?? key,
+ }),
+}));
+
+function buildField(
+ overrides: Partial<SettingsFieldSchema> = {},
+): SettingsFieldSchema {
+ return {
+ key: "llm.top_p",
+ label: "Top P",
+ description: "Controls nucleus sampling.",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "number",
+ default: 1,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ ...overrides,
+ };
+}
+
+describe("SchemaField", () => {
+ it("constrains the Top P input to the valid numeric range", () => {
+ render(
+ <SchemaField
+ field={buildField()}
+ value="1"
+ isDisabled={false}
+ onChange={() => {}}
+ />,
+ );
+
+ const input = screen.getByTestId("sdk-settings-llm.top_p");
+
+ expect(input).toHaveAttribute("min", "0");
+ expect(input).toHaveAttribute("max", "1");
+ expect(input).toHaveAttribute("step", "0.01");
+ });
+
+ it("translates schema-backed labels and descriptions", () => {
+ render(
+ <SchemaField
+ field={buildField({
+ label: "SETTINGS$TOP_P_LABEL",
+ description: "SETTINGS$TOP_P_DESCRIPTION",
+ })}
+ value="1"
+ isDisabled={false}
+ onChange={() => {}}
+ />,
+ );
+
+ expect(screen.getByText("Top P")).toBeInTheDocument();
+ expect(screen.getByText("Controls nucleus sampling.")).toBeInTheDocument();
+ });
+});
diff --git a/frontend/__tests__/components/features/settings/sdk-settings/sdk-section-page.test.tsx b/frontend/__tests__/components/features/settings/sdk-settings/sdk-section-page.test.tsx
new file mode 100644
index 0000000000..5878a9e02c
--- /dev/null
+++ b/frontend/__tests__/components/features/settings/sdk-settings/sdk-section-page.test.tsx
@@ -0,0 +1,625 @@
+import React from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import SettingsService from "#/api/settings-service/settings-service.api";
+import { SdkSectionPage } from "#/components/features/settings/sdk-settings/sdk-section-page";
+import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
+import { Settings } from "#/types/settings";
+import * as ToastHandlers from "#/utils/custom-toast-handlers";
+
+const mockUseSearchParams = vi.fn();
+vi.mock("react-router", async () => {
+ const actual =
+ await vi.importActual<typeof import("react-router")>("react-router");
+ return {
+ ...actual,
+ useSearchParams: () => mockUseSearchParams(),
+ useRevalidator: () => ({ revalidate: vi.fn() }),
+ };
+});
+
+const mockUseConfig = vi.fn();
+vi.mock("#/hooks/query/use-config", () => ({
+ useConfig: () => mockUseConfig(),
+}));
+
+function buildSettings(overrides: Partial<Settings> = {}): Settings {
+ return {
+ ...MOCK_DEFAULT_USER_SETTINGS,
+ ...overrides,
+ agent_settings: {
+ ...MOCK_DEFAULT_USER_SETTINGS.agent_settings,
+ ...overrides.agent_settings,
+ },
+ agent_settings_schema:
+ overrides.agent_settings_schema ??
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema,
+ };
+}
+
+function buildSavableSettings(): Settings {
+ return buildSettings({
+ agent_settings_schema: {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.endpoint",
+ label: "Endpoint",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "https://api.example.com",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ ],
+ },
+ ],
+ },
+ agent_settings: {
+ "llm.endpoint": "https://api.example.com",
+ },
+ });
+}
+
+function renderSdkSectionPage(
+ props: React.ComponentProps<typeof SdkSectionPage>,
+) {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+ });
+
+ mockUseConfig.mockReturnValue({
+ data: { app_mode: "oss" },
+ isLoading: false,
+ });
+ mockUseSearchParams.mockReturnValue([{ get: () => null }, vi.fn()]);
+
+ return render(React.createElement(SdkSectionPage, props), {
+ wrapper: ({ children }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ ),
+ });
+}
+
+beforeEach(() => {
+ vi.restoreAllMocks();
+ mockUseConfig.mockReturnValue({
+ data: { app_mode: "oss" },
+ isLoading: false,
+ });
+ mockUseSearchParams.mockReturnValue([{ get: () => null }, vi.fn()]);
+});
+
+describe("SdkSectionPage", () => {
+ it("renders advanced-only fields when a custom initial view is provided", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.model",
+ label: "Model",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "openai/gpt-4o",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.api_version",
+ label: "API Version",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ };
+
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ "llm.model": "openai/gpt-4o",
+ },
+ }),
+ );
+
+ renderSdkSectionPage({
+ sectionKeys: ["llm"],
+ getInitialView: () => "advanced",
+ });
+
+ expect(
+ await screen.findByTestId("sdk-settings-llm.api_version"),
+ ).toBeInTheDocument();
+ });
+
+ it("preserves the selected view when parent rerenders with the same settings", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.model",
+ label: "Model",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "openhands/claude-opus-4-5-20251101",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.base_url",
+ label: "Base URL",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ };
+
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ "llm.model": "openhands/claude-opus-4-5-20251101",
+ },
+ }),
+ );
+
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+ });
+
+ function Wrapper() {
+ const [externalValue, setExternalValue] = React.useState("");
+
+ return (
+ <SdkSectionPage
+ sectionKeys={["llm"]}
+ header={() => (
+ <input
+ data-testid="external-state-input"
+ value={externalValue}
+ onChange={(event) => setExternalValue(event.target.value)}
+ />
+ )}
+ />
+ );
+ }
+
+ render(<Wrapper />, {
+ wrapper: ({ children }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ ),
+ });
+
+ await screen.findByTestId("sdk-section-advanced-toggle");
+ await userEvent.click(screen.getByTestId("sdk-section-advanced-toggle"));
+ await screen.findByTestId("sdk-settings-llm.base_url");
+
+ await userEvent.type(screen.getByTestId("external-state-input"), "a");
+
+ await waitFor(() => {
+ expect(screen.getByTestId("sdk-settings-llm.base_url")).toBeInTheDocument();
+ });
+ });
+
+ it("resets from advanced to the inferred basic view after saving when advanced settings match defaults", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.endpoint",
+ label: "Endpoint",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "https://api.example.com",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.api_version",
+ label: "API Version",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ };
+
+ let persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ endpoint: "https://api.example.com",
+ },
+ },
+ });
+
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ vi.spyOn(SettingsService, "saveSettings").mockImplementation(async (payload) => {
+ const agentSettings = (payload.agent_settings ?? {}) as Record<string, unknown>;
+ const llmSettings = (agentSettings.llm ?? {}) as Record<string, unknown>;
+
+ persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ endpoint:
+ typeof llmSettings.endpoint === "string"
+ ? llmSettings.endpoint
+ : "https://api.example.com",
+ },
+ },
+ });
+
+ return true;
+ });
+
+ renderSdkSectionPage({ sectionKeys: ["llm"] });
+
+ await screen.findByTestId("sdk-section-advanced-toggle");
+ await userEvent.click(screen.getByTestId("sdk-section-advanced-toggle"));
+ await screen.findByTestId("sdk-settings-llm.api_version");
+
+ const endpointInput = await screen.findByTestId("sdk-settings-llm.endpoint");
+ await userEvent.clear(endpointInput);
+ await userEvent.type(endpointInput, "https://api.changed.example.com");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
+
+ await waitFor(() => {
+ expect(
+ screen.queryByTestId("sdk-settings-llm.api_version"),
+ ).not.toBeInTheDocument();
+ });
+ });
+
+ it("resets from all to the inferred basic view after saving when detailed settings match defaults", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.endpoint",
+ label: "Endpoint",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "https://api.example.com",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ };
+
+ let persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ endpoint: "https://api.example.com",
+ },
+ },
+ });
+
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ vi.spyOn(SettingsService, "saveSettings").mockImplementation(async (payload) => {
+ const agentSettings = (payload.agent_settings ?? {}) as Record<string, unknown>;
+ const llmSettings = (agentSettings.llm ?? {}) as Record<string, unknown>;
+
+ persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ endpoint:
+ typeof llmSettings.endpoint === "string"
+ ? llmSettings.endpoint
+ : "https://api.example.com",
+ },
+ },
+ });
+
+ return true;
+ });
+
+ renderSdkSectionPage({ sectionKeys: ["llm"] });
+
+ await screen.findByTestId("sdk-section-all-toggle");
+ await userEvent.click(screen.getByTestId("sdk-section-all-toggle"));
+ await screen.findByTestId("sdk-settings-llm.timeout");
+
+ const endpointInput = await screen.findByTestId("sdk-settings-llm.endpoint");
+ await userEvent.clear(endpointInput);
+ await userEvent.type(endpointInput, "https://api.changed.example.com");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
+
+ await waitFor(() => {
+ expect(screen.queryByTestId("sdk-settings-llm.timeout")).not.toBeInTheDocument();
+ });
+ });
+
+
+
+ it("shows the all toggle instead of an empty advanced tier for minor-only schemas", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "condenser",
+ label: "Condenser",
+ fields: [
+ {
+ key: "condenser.enabled",
+ label: "Enable memory condensation",
+ section: "condenser",
+ section_label: "Condenser",
+ value_type: "boolean",
+ default: true,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "condenser.max_size",
+ label: "Max size",
+ section: "condenser",
+ section_label: "Condenser",
+ value_type: "integer",
+ default: 240,
+ choices: [],
+ depends_on: ["condenser.enabled"],
+ prominence: "minor",
+ secret: false,
+ required: true,
+ },
+ ],
+ },
+ ],
+ };
+
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ "condenser.enabled": true,
+ "condenser.max_size": 240,
+ },
+ }),
+ );
+
+ renderSdkSectionPage({ sectionKeys: ["condenser"] });
+
+ await screen.findByTestId("sdk-section-basic-toggle");
+ expect(
+ screen.queryByTestId("sdk-section-advanced-toggle"),
+ ).not.toBeInTheDocument();
+ expect(screen.getByTestId("sdk-section-all-toggle")).toBeInTheDocument();
+ });
+
+ it("renders URL-like schema fields as url inputs", async () => {
+ const schema: NonNullable<Settings["agent_settings_schema"]> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "verification",
+ label: "Verification",
+ fields: [
+ {
+ key: "verification.critic_enabled",
+ label: "Enable critic",
+ section: "verification",
+ section_label: "Verification",
+ value_type: "boolean",
+ default: true,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "verification.critic_server_url",
+ label: "Critic server URL",
+ section: "verification",
+ section_label: "Verification",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: ["verification.critic_enabled"],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ };
+
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ "verification.critic_enabled": true,
+ "verification.critic_server_url": "https://critic.example.com",
+ },
+ }),
+ );
+
+ renderSdkSectionPage({
+ sectionKeys: ["verification"],
+ getInitialView: () => "all",
+ });
+
+ expect(
+ await screen.findByTestId("sdk-settings-verification.critic_server_url"),
+ ).toHaveAttribute("type", "url");
+ });
+
+ it("shows a success toast after saving settings", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSavableSettings(),
+ );
+ vi.spyOn(SettingsService, "saveSettings").mockResolvedValue(true);
+ const displaySuccessToastSpy = vi.spyOn(
+ ToastHandlers,
+ "displaySuccessToast",
+ );
+
+ renderSdkSectionPage({ sectionKeys: ["llm"] });
+
+ const endpointInput = await screen.findByTestId(
+ "sdk-settings-llm.endpoint",
+ );
+ await userEvent.clear(endpointInput);
+ await userEvent.type(endpointInput, "https://api.changed.example.com");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(displaySuccessToastSpy).toHaveBeenCalled();
+ });
+ });
+
+ it("shows an error toast when saving settings fails", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSavableSettings(),
+ );
+ vi.spyOn(SettingsService, "saveSettings").mockRejectedValue(
+ new AxiosError("Request failed"),
+ );
+ const displayErrorToastSpy = vi.spyOn(ToastHandlers, "displayErrorToast");
+
+ renderSdkSectionPage({ sectionKeys: ["llm"] });
+
+ const endpointInput = await screen.findByTestId(
+ "sdk-settings-llm.endpoint",
+ );
+ await userEvent.clear(endpointInput);
+ await userEvent.type(endpointInput, "https://api.changed.example.com");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(displayErrorToastSpy).toHaveBeenCalled();
+ });
+ });
+
+ it("allows saving custom payloads when only external state is dirty", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
+
+ renderSdkSectionPage({
+ sectionKeys: ["llm"],
+ extraDirty: true,
+ buildPayload: (payload) => ({
+ ...payload,
+ search_api_key: "external-search-key",
+ }),
+ });
+
+ await userEvent.click(await screen.findByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({ search_api_key: "external-search-key" }),
+ );
+ });
+ });
+});
diff --git a/frontend/__tests__/components/features/user/user-context-menu.test.tsx b/frontend/__tests__/components/features/user/user-context-menu.test.tsx
index dd0706527c..ea022efeea 100644
--- a/frontend/__tests__/components/features/user/user-context-menu.test.tsx
+++ b/frontend/__tests__/components/features/user/user-context-menu.test.tsx
@@ -100,7 +100,6 @@ const createMockUser = (
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
...overrides,
@@ -203,7 +202,7 @@ describe("UserContextMenu", () => {
await waitFor(() => {
expectedItems.forEach((item) => {
- expect(screen.getByText(item.text)).toBeInTheDocument();
+ expect(screen.getAllByText(item.text).length).toBeGreaterThan(0);
});
});
});
@@ -237,7 +236,7 @@ describe("UserContextMenu", () => {
await waitFor(() => {
expectedItems.forEach((item) => {
- expect(screen.getByText(item.text)).toBeInTheDocument();
+ expect(screen.getAllByText(item.text).length).toBeGreaterThan(0);
});
});
});
@@ -608,7 +607,6 @@ describe("UserContextMenu", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -644,7 +642,6 @@ describe("UserContextMenu", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
diff --git a/frontend/__tests__/components/modals/settings/model-selector.test.tsx b/frontend/__tests__/components/modals/settings/model-selector.test.tsx
index d01c5b6c6a..215c0c115c 100644
--- a/frontend/__tests__/components/modals/settings/model-selector.test.tsx
+++ b/frontend/__tests__/components/modals/settings/model-selector.test.tsx
@@ -3,7 +3,10 @@ import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ModelSelector } from "#/components/shared/modals/settings/model-selector";
-import type { LLMProvider, LLMModel } from "#/api/config-service/config-service.types";
+import type {
+ LLMProvider,
+ LLMModel,
+} from "#/api/config-service/config-service.types";
const mockProviders: LLMProvider[] = [
{ name: "openai", verified: true },
@@ -133,4 +136,10 @@ describe("ModelSelector", () => {
expect(screen.getByLabelText("LLM Model")).toHaveValue("ada");
});
});
+
+ it("should stretch the provider and model selectors across the full row", () => {
+ const { container } = renderWithQuery(<ModelSelector />);
+
+ expect(container.firstChild).toHaveClass("w-full");
+ });
});
diff --git a/frontend/__tests__/components/shared/modals/settings/settings-form.test.tsx b/frontend/__tests__/components/shared/modals/settings/settings-form.test.tsx
index 6cf5f4b647..4872382cc7 100644
--- a/frontend/__tests__/components/shared/modals/settings/settings-form.test.tsx
+++ b/frontend/__tests__/components/shared/modals/settings/settings-form.test.tsx
@@ -6,6 +6,7 @@ import { screen } from "@testing-library/react";
import SettingsService from "#/api/settings-service/settings-service.api";
import { SettingsForm } from "#/components/shared/modals/settings/settings-form";
import { DEFAULT_SETTINGS } from "#/services/settings";
+import { getAgentSettingValue } from "#/utils/sdk-settings-schema";
describe("SettingsForm", () => {
const onCloseMock = vi.fn();
@@ -29,7 +30,11 @@ describe("SettingsForm", () => {
expect(saveSettingsSpy).toHaveBeenCalledWith(
expect.objectContaining({
- llm_model: DEFAULT_SETTINGS.llm_model,
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({
+ model: getAgentSettingValue(DEFAULT_SETTINGS, "llm.model"),
+ }),
+ }),
}),
);
});
diff --git a/frontend/__tests__/hooks/mutation/use-save-settings.test.tsx b/frontend/__tests__/hooks/mutation/use-save-settings.test.tsx
index e3216beb3c..2e8fac9757 100644
--- a/frontend/__tests__/hooks/mutation/use-save-settings.test.tsx
+++ b/frontend/__tests__/hooks/mutation/use-save-settings.test.tsx
@@ -10,7 +10,7 @@ describe("useSaveSettings", () => {
useSelectedOrganizationStore.setState({ organizationId: "test-org-id" });
});
- it("should send an empty string for llm_api_key if an empty string is passed, otherwise undefined", async () => {
+ it("should preserve canonical llm.api_key payload values", async () => {
const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
const { result } = renderHook(() => useSaveSettings(), {
wrapper: ({ children }) => (
@@ -20,20 +20,20 @@ describe("useSaveSettings", () => {
),
});
- result.current.mutate({ llm_api_key: "" });
+ result.current.mutate({ "llm.api_key": "" });
await waitFor(() => {
expect(saveSettingsSpy).toHaveBeenCalledWith(
expect.objectContaining({
- llm_api_key: "",
+ "llm.api_key": "",
}),
);
});
- result.current.mutate({ llm_api_key: null });
+ result.current.mutate({ "llm.api_key": null });
await waitFor(() => {
expect(saveSettingsSpy).toHaveBeenCalledWith(
expect.objectContaining({
- llm_api_key: undefined,
+ "llm.api_key": null,
}),
);
});
diff --git a/frontend/__tests__/hooks/query/organization-scoped-queries.test.tsx b/frontend/__tests__/hooks/query/organization-scoped-queries.test.tsx
index a32ea3500a..57f4a401e5 100644
--- a/frontend/__tests__/hooks/query/organization-scoped-queries.test.tsx
+++ b/frontend/__tests__/hooks/query/organization-scoped-queries.test.tsx
@@ -2,7 +2,7 @@ import { renderHook, waitFor } from "@testing-library/react";
import { describe, expect, it, vi, beforeEach } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import React from "react";
-import { useSettings } from "#/hooks/query/use-settings";
+import { getSettingsQueryFn, useSettings } from "#/hooks/query/use-settings";
import { useGetSecrets } from "#/hooks/query/use-get-secrets";
import { useApiKeys } from "#/hooks/query/use-api-keys";
import SettingsService from "#/api/settings-service/settings-service.api";
@@ -60,11 +60,15 @@ describe("Organization-scoped query hooks", () => {
await waitFor(() => expect(result.current.isFetched).toBe(true));
// Verify the query was cached with the org-specific key
- const cachedData = queryClient.getQueryData(["settings", "org-1"]);
+ const cachedData = queryClient.getQueryData([
+ "settings",
+ "personal",
+ "org-1",
+ ]);
expect(cachedData).toBeDefined();
- // Verify no data is cached under the old key without org ID
- const oldKeyData = queryClient.getQueryData(["settings"]);
+ // Verify no data is cached under the old key without the scope segment
+ const oldKeyData = queryClient.getQueryData(["settings", "org-1"]);
expect(oldKeyData).toBeUndefined();
});
@@ -99,11 +103,38 @@ describe("Organization-scoped query hooks", () => {
});
// Verify both org caches exist independently
- const org1Data = queryClient.getQueryData(["settings", "org-1"]);
- const org2Data = queryClient.getQueryData(["settings", "org-2"]);
+ const org1Data = queryClient.getQueryData([
+ "settings",
+ "personal",
+ "org-1",
+ ]);
+ const org2Data = queryClient.getQueryData([
+ "settings",
+ "personal",
+ "org-2",
+ ]);
expect(org1Data).toBeDefined();
expect(org2Data).toBeDefined();
});
+
+ it("should prefer schema-managed LLM values over stale legacy flat fields", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue({
+ ...MOCK_DEFAULT_USER_SETTINGS,
+ llm_model: "openai/gpt-4o",
+ llm_base_url: "https://stale.example/v1",
+ agent_settings: {
+ ...MOCK_DEFAULT_USER_SETTINGS.agent_settings,
+ "llm.model": MOCK_DEFAULT_USER_SETTINGS.llm_model,
+ "llm.base_url": null,
+ },
+ });
+
+ const settings = await getSettingsQueryFn();
+
+ expect(settings.llm_model).toBe(MOCK_DEFAULT_USER_SETTINGS.llm_model);
+ expect(settings.llm_base_url).toBe("");
+ });
+
});
describe("useGetSecrets", () => {
@@ -193,7 +224,9 @@ describe("Organization-scoped query hooks", () => {
});
await waitFor(() => {
- expect(queryClient.getQueryData(["settings", "org-1"])).toBeDefined();
+ expect(
+ queryClient.getQueryData(["settings", "personal", "org-1"]),
+ ).toBeDefined();
});
// Switch to org-2
@@ -206,7 +239,9 @@ describe("Organization-scoped query hooks", () => {
rerender();
await waitFor(() => {
- expect(queryClient.getQueryData(["settings", "org-2"])).toBeDefined();
+ expect(
+ queryClient.getQueryData(["settings", "personal", "org-2"]),
+ ).toBeDefined();
});
// Switch back to org-1 - should use cached data, not refetch
@@ -214,11 +249,19 @@ describe("Organization-scoped query hooks", () => {
rerender();
// org-1 data should still be in cache
- const org1Cache = queryClient.getQueryData(["settings", "org-1"]) as any;
+ const org1Cache = queryClient.getQueryData([
+ "settings",
+ "personal",
+ "org-1",
+ ]) as any;
expect(org1Cache?.language).toBe("en");
// org-2 data should also still be in cache
- const org2Cache = queryClient.getQueryData(["settings", "org-2"]) as any;
+ const org2Cache = queryClient.getQueryData([
+ "settings",
+ "personal",
+ "org-2",
+ ]) as any;
expect(org2Cache?.language).toBe("fr");
});
});
diff --git a/frontend/__tests__/hooks/query/use-organizations.test.tsx b/frontend/__tests__/hooks/query/use-organizations.test.tsx
index a42a5b3e77..56530a4a15 100644
--- a/frontend/__tests__/hooks/query/use-organizations.test.tsx
+++ b/frontend/__tests__/hooks/query/use-organizations.test.tsx
@@ -35,21 +35,13 @@ function createMinimalOrg(
contact_name: "",
contact_email: "",
conversation_expiration: 0,
- agent: "",
- default_max_iterations: 0,
- security_analyzer: "",
- confirmation_mode: false,
- default_llm_model: "",
- default_llm_api_key_for_byor: "",
- default_llm_base_url: "",
remote_runtime_resource_factor: 0,
- enable_default_condenser: false,
billing_margin: 0,
enable_proactive_conversation_starters: false,
sandbox_base_container_image: "",
sandbox_runtime_container_image: "",
org_version: 0,
- mcp_config: { tools: [], settings: {} },
+ agent_settings: {},
search_api_key: null,
sandbox_api_key: null,
max_budget_per_task: 0,
diff --git a/frontend/__tests__/hooks/use-auto-login.test.tsx b/frontend/__tests__/hooks/use-auto-login.test.tsx
new file mode 100644
index 0000000000..562cb1b31c
--- /dev/null
+++ b/frontend/__tests__/hooks/use-auto-login.test.tsx
@@ -0,0 +1,73 @@
+import { renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const mockUseConfig = vi.fn();
+const mockUseIsAuthed = vi.fn();
+const mockGetLoginMethod = vi.fn();
+
+vi.mock("#/hooks/query/use-config", () => ({
+ useConfig: () => mockUseConfig(),
+}));
+
+vi.mock("#/hooks/query/use-is-authed", () => ({
+ useIsAuthed: () => mockUseIsAuthed(),
+}));
+
+vi.mock("#/utils/local-storage", () => ({
+ LoginMethod: {
+ GITHUB: "github",
+ GITLAB: "gitlab",
+ BITBUCKET: "bitbucket",
+ BITBUCKET_DATA_CENTER: "bitbucket_data_center",
+ AZURE_DEVOPS: "azure_devops",
+ ENTERPRISE_SSO: "enterprise_sso",
+ },
+ getLoginMethod: () => mockGetLoginMethod(),
+}));
+
+
+vi.mock("#/hooks/use-is-on-intermediate-page", () => ({
+ useIsOnIntermediatePage: () => true,
+}));
+
+import { useAutoLogin } from "#/hooks/use-auto-login";
+
+describe("useAutoLogin", () => {
+ const acceptTosUrl =
+ "https://ohpr-13306-497.staging.all-hands.dev/accept-tos?redirect_url=" +
+ encodeURIComponent(
+ "https://ohpr-13306-497.auth.staging.all-hands.dev/realms/allhands/protocol/openid-connect/auth?client_id=allhands&response_type=code",
+ );
+
+ beforeEach(() => {
+ vi.stubGlobal("location", { href: acceptTosUrl });
+
+ mockUseConfig.mockReturnValue({
+ data: {
+ app_mode: "saas",
+ auth_url: "ohpr-13306-497.auth.staging.all-hands.dev",
+ },
+ isLoading: false,
+ });
+
+ mockUseIsAuthed.mockReturnValue({
+ data: false,
+ isLoading: false,
+ });
+
+ mockGetLoginMethod.mockReturnValue("github");
+ });
+
+ afterEach(() => {
+ vi.unstubAllGlobals();
+ vi.clearAllMocks();
+ });
+
+ it("should not restart OAuth while the user is already on /accept-tos", async () => {
+ renderHook(() => useAutoLogin());
+
+ await waitFor(() => {
+ expect(window.location.href).toBe(acceptTosUrl);
+ });
+ });
+});
diff --git a/frontend/__tests__/routes/billing.test.tsx b/frontend/__tests__/routes/billing.test.tsx
index 436192f9a0..090ccbd085 100644
--- a/frontend/__tests__/routes/billing.test.tsx
+++ b/frontend/__tests__/routes/billing.test.tsx
@@ -85,7 +85,6 @@ describe("Billing Route", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
...overrides,
diff --git a/frontend/__tests__/routes/llm-settings.test.tsx b/frontend/__tests__/routes/llm-settings.test.tsx
index 57be79a796..0b9bfc8b52 100644
--- a/frontend/__tests__/routes/llm-settings.test.tsx
+++ b/frontend/__tests__/routes/llm-settings.test.tsx
@@ -1,53 +1,19 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { render, screen, waitFor, within } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { beforeEach, describe, expect, it, vi } from "vitest";
-import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
-import LlmSettingsScreen from "#/routes/llm-settings";
+
+import { organizationService } from "#/api/organization-service/organization-service.api";
import SettingsService from "#/api/settings-service/settings-service.api";
import {
MOCK_DEFAULT_USER_SETTINGS,
resetTestHandlersMockSettings,
} from "#/mocks/handlers";
-import * as AdvancedSettingsUtlls from "#/utils/has-advanced-settings-set";
-import * as ToastHandlers from "#/utils/custom-toast-handlers";
-import OptionService from "#/api/option-service/option-service.api";
-import { organizationService } from "#/api/organization-service/organization-service.api";
+import LlmSettingsScreen, { clientLoader } from "#/routes/llm-settings";
import { useSelectedOrganizationStore } from "#/stores/selected-organization-store";
-import type { Organization, OrganizationMember } from "#/types/org";
-
-/** Creates a mock Organization with default values for testing */
-const createMockOrganization = (
- overrides: Partial<Organization> & Pick<Organization, "id" | "name">,
-): Organization => ({
- contact_name: "",
- contact_email: "",
- conversation_expiration: 0,
- agent: "CodeActAgent",
- default_max_iterations: 20,
- security_analyzer: "",
- confirmation_mode: false,
- default_llm_model: "",
- default_llm_api_key_for_byor: "",
- default_llm_base_url: "",
- remote_runtime_resource_factor: 1,
- enable_default_condenser: true,
- billing_margin: 0,
- enable_proactive_conversation_starters: false,
- sandbox_base_container_image: "",
- sandbox_runtime_container_image: "",
- org_version: 1,
- mcp_config: { tools: [], settings: {} },
- search_api_key: null,
- sandbox_api_key: null,
- max_budget_per_task: 0,
- enable_solvability_analysis: false,
- v1_enabled: true,
- credits: 0,
- is_personal: false,
- ...overrides,
-});
+import { Organization, OrganizationMember } from "#/types/org";
+import { Settings, SettingsValue } from "#/types/settings";
-// Mock react-router hooks
const mockUseSearchParams = vi.fn();
vi.mock("react-router", async () => {
const actual =
@@ -55,60 +21,34 @@ vi.mock("react-router", async () => {
return {
...actual,
useSearchParams: () => mockUseSearchParams(),
- useRevalidator: () => ({
- revalidate: vi.fn(),
- }),
+ useRevalidator: () => ({ revalidate: vi.fn() }),
};
});
-// Mock useIsAuthed hook
-const mockUseIsAuthed = vi.fn();
-vi.mock("#/hooks/query/use-is-authed", () => ({
- useIsAuthed: () => mockUseIsAuthed(),
-}));
-
-// Mock useConfig hook
const mockUseConfig = vi.fn();
vi.mock("#/hooks/query/use-config", () => ({
useConfig: () => mockUseConfig(),
}));
-// Mock useOrgTypeAndAccess hook
-const mockUseOrgTypeAndAccess = vi.fn();
-vi.mock("#/hooks/use-org-type-and-access", () => ({
- useOrgTypeAndAccess: () => mockUseOrgTypeAndAccess(),
-}));
-
-const renderLlmSettingsScreen = (
- orgId: string | null = null,
- meData?: {
- org_id: string;
- user_id: string;
- email: string;
- role: string;
- status: string;
- llm_api_key: string;
- max_iterations: number;
- llm_model: string;
- llm_api_key_for_byor: string | null;
- llm_base_url: string;
- },
-) => {
- const queryClient = new QueryClient({
- defaultOptions: {
- queries: {
- retry: false,
- },
+function buildSettings(overrides: Partial<Settings> = {}): Settings {
+ return {
+ ...MOCK_DEFAULT_USER_SETTINGS,
+ ...overrides,
+ agent_settings: {
+ ...MOCK_DEFAULT_USER_SETTINGS.agent_settings,
+ ...overrides.agent_settings,
},
- });
- // Default to orgId "1" if not provided (for backward compatibility)
- const finalOrgId = orgId ?? "1";
- useSelectedOrganizationStore.setState({ organizationId: finalOrgId });
-
- // Pre-populate React Query cache with me data
- // If meData is provided, use it; otherwise use default owner data
- const defaultMeData = {
- org_id: finalOrgId,
+ agent_settings_schema:
+ overrides.agent_settings_schema ??
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema,
+ };
+}
+
+function buildOrganizationMember(
+ overrides: Partial<OrganizationMember> = {},
+): OrganizationMember {
+ return {
+ org_id: "1",
user_id: "99",
role: "owner",
@@ -116,1743 +56,1741 @@ const renderLlmSettingsScreen = (
llm_api_key: "",
max_iterations: 20,
llm_model: "",
- llm_api_key_for_byor: null,
llm_base_url: "",
+ ...overrides,
+ };
+}
+
+function buildOrganization(
+ overrides: Partial<Organization> = {},
+): Organization {
+ return {
+ id: overrides.id ?? "1",
+ name: overrides.name ?? "Example Org",
+ contact_name: overrides.contact_name ?? "Example Contact",
+ contact_email: overrides.contact_email ?? "[email protected]",
+ conversation_expiration: overrides.conversation_expiration ?? 30,
+ remote_runtime_resource_factor:
+ overrides.remote_runtime_resource_factor ?? 1,
+ billing_margin: overrides.billing_margin ?? 0,
+ enable_proactive_conversation_starters:
+ overrides.enable_proactive_conversation_starters ?? false,
+ sandbox_base_container_image:
+ overrides.sandbox_base_container_image ??
+ "ghcr.io/all-hands-ai/runtime:latest",
+ sandbox_runtime_container_image:
+ overrides.sandbox_runtime_container_image ??
+ "ghcr.io/all-hands-ai/runtime:latest",
+ org_version: overrides.org_version ?? 1,
+ search_api_key: overrides.search_api_key ?? null,
+ sandbox_api_key: overrides.sandbox_api_key ?? null,
+ max_budget_per_task: overrides.max_budget_per_task ?? 0,
+ enable_solvability_analysis: overrides.enable_solvability_analysis ?? false,
+ v1_enabled: overrides.v1_enabled ?? true,
+ credits: overrides.credits ?? 0,
+ is_personal: overrides.is_personal,
+ ...overrides,
};
- queryClient.setQueryData(
- ["organizations", finalOrgId, "me"],
- meData || defaultMeData,
+}
+
+function buildSettingsWithAdvancedToggle(
+ overrides: Partial<Settings> = {},
+): Settings {
+ const schema = structuredClone(
+ overrides.agent_settings_schema ??
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
);
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+
+ if (
+ llmSection &&
+ !llmSection.fields.some((field) => field.key === "llm.timeout")
+ ) {
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ });
+ }
+
+ return buildSettings({ ...overrides, agent_settings_schema: schema });
+}
- return render(<LlmSettingsScreen />, {
+async function selectProvider(providerLabel: "OpenHands" | "OpenAI") {
+ const providerInput = screen.getByTestId("llm-provider-input");
+ await userEvent.click(providerInput);
+ await userEvent.click(await screen.findByText(providerLabel));
+ await waitFor(() => {
+ expect(providerInput).toHaveValue(providerLabel);
+ });
+ return providerInput;
+}
+
+async function selectModel(modelLabel: string) {
+ const modelInput = screen.getByTestId("llm-model-input");
+ await userEvent.click(modelInput);
+ await userEvent.click(await screen.findByText(modelLabel));
+ await waitFor(() => {
+ expect(modelInput).toHaveValue(modelLabel);
+ });
+ return modelInput;
+}
+
+function renderLlmSettingsScreen({
+ appMode = "oss",
+ organizationId = "1",
+ meData,
+ organizations,
+ scope = "personal",
+}: {
+ appMode?: "oss" | "saas";
+ organizationId?: string;
+ meData?: OrganizationMember;
+ organizations?: Organization[];
+ scope?: "personal" | "org";
+} = {}) {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+ });
+
+ useSelectedOrganizationStore.setState({ organizationId });
+ mockUseConfig.mockReturnValue({
+ data: { app_mode: appMode },
+ isLoading: false,
+ });
+
+ if (appMode === "saas") {
+ queryClient.setQueryData(["user", "authenticated", appMode], true);
+ queryClient.setQueryData(
+ ["organizations", organizationId, "me"],
+ meData ?? buildOrganizationMember({ org_id: organizationId }),
+ );
+ queryClient.setQueryData(["organizations"], {
+ items: organizations ?? [
+ buildOrganization({ id: organizationId, is_personal: false }),
+ ],
+ currentOrgId: organizationId,
+ });
+ }
+
+ return render(<LlmSettingsScreen scope={scope} />, {
wrapper: ({ children }) => (
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
),
});
-};
+}
beforeEach(() => {
- vi.resetAllMocks();
+ vi.restoreAllMocks();
resetTestHandlersMockSettings();
-
- // Default mock for useSearchParams - returns empty params
- mockUseSearchParams.mockReturnValue([
- {
- get: () => null,
- },
- vi.fn(),
- ]);
-
- // Default mock for useIsAuthed - returns authenticated by default
- mockUseIsAuthed.mockReturnValue({ data: true, isLoading: false });
-
- // Default mock for useConfig - returns SaaS mode by default
+ mockUseSearchParams.mockReturnValue([{ get: () => null }, vi.fn()]);
mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
+ data: { app_mode: "oss" },
isLoading: false,
});
-
- // Default mock for organizationService.getMe - returns owner role by default (full access)
- const defaultMeData: OrganizationMember = {
- org_id: "1",
- user_id: "99",
- email: "[email protected]",
- role: "owner",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
- };
- vi.spyOn(organizationService, "getMe").mockResolvedValue(defaultMeData);
-
- // Reset organization store
useSelectedOrganizationStore.setState({ organizationId: "1" });
-
- // Default mock for useOrgTypeAndAccess - returns team org by default
- mockUseOrgTypeAndAccess.mockReturnValue({
- selectedOrg: createMockOrganization({ id: "1", name: "Test Org", is_personal: false }),
- isPersonalOrg: false,
- isTeamOrg: true,
- canViewOrgRoutes: true,
- organizationId: "1",
- });
});
-describe("Content", () => {
- describe("Basic form", () => {
- it("should render the basic form by default", async () => {
- // Use OSS mode so API key input is visible
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- within(basicForm).getByTestId("llm-provider-input");
- within(basicForm).getByTestId("llm-model-input");
- within(basicForm).getByTestId("llm-api-key-input");
- within(basicForm).getByTestId("llm-api-key-help-anchor");
- });
-
- it("should render the default values if non exist", async () => {
- // Use OSS mode so API key input is visible
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const provider = screen.getByTestId("llm-provider-input");
- const model = screen.getByTestId("llm-model-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
+describe("LlmSettingsScreen", () => {
+ it("renders the schema-driven basic LLM form in OSS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
- await waitFor(() => {
- expect(provider).toHaveValue("OpenHands");
- expect(model).toHaveValue("claude-opus-4-5-20251101");
+ renderLlmSettingsScreen({ appMode: "oss" });
- expect(apiKey).toHaveValue("");
- expect(apiKey).toHaveProperty("placeholder", "");
- });
- });
+ await screen.findByTestId("llm-settings-screen");
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ expect(screen.getByTestId("llm-provider-input")).toBeInTheDocument();
+ expect(screen.getByTestId("llm-model-input")).toBeInTheDocument();
+ expect(screen.getByTestId("llm-api-key-input")).toBeInTheDocument();
+ expect(screen.getByTestId("save-button")).toBeInTheDocument();
+ });
- it("should render the existing settings values", async () => {
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ it("opens advanced view when a custom advanced LLM base URL is already set", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
llm_model: "openai/gpt-4o",
- llm_api_key_set: true,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ llm_base_url: "https://custom.example/v1",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://custom.example/v1",
+ },
+ },
+ }),
+ );
- const provider = screen.getByTestId("llm-provider-input");
- const model = screen.getByTestId("llm-model-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
+ renderLlmSettingsScreen({ appMode: "oss" });
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
- expect(model).toHaveValue("gpt-4o");
-
- expect(apiKey).toHaveValue("");
- expect(apiKey).toHaveProperty("placeholder", "<hidden>");
- expect(screen.getByTestId("set-indicator")).toBeInTheDocument();
- });
- });
+ await screen.findByTestId("llm-settings-form-advanced");
+ expect(screen.getByTestId("llm-custom-model-input")).toBeInTheDocument();
+ expect(screen.getByTestId("base-url-input")).toBeInTheDocument();
});
- describe("Advanced form", () => {
- it("should conditionally show security analyzer based on confirmation mode", async () => {
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Enable advanced mode first
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
-
- const confirmation = screen.getByTestId(
- "enable-confirmation-mode-switch",
- );
-
- // Initially confirmation mode is false, so security analyzer should not be visible
- expect(confirmation).not.toBeChecked();
- expect(
- screen.queryByTestId("security-analyzer-input"),
- ).not.toBeInTheDocument();
-
- // Enable confirmation mode
- await userEvent.click(confirmation);
- expect(confirmation).toBeChecked();
-
- // Security analyzer should now be visible
- screen.getByTestId("security-analyzer-input");
-
- // Disable confirmation mode again
- await userEvent.click(confirmation);
- expect(confirmation).not.toBeChecked();
-
- // Security analyzer should be hidden again
- expect(
- screen.queryByTestId("security-analyzer-input"),
- ).not.toBeInTheDocument();
- });
-
- it("should render the advanced form if the switch is toggled", async () => {
- // V1 is always enabled, so no agent-input in the form
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- const basicForm = screen.getByTestId("llm-settings-form-basic");
-
- expect(
- screen.queryByTestId("llm-settings-form-advanced"),
- ).not.toBeInTheDocument();
- expect(basicForm).toBeInTheDocument();
-
- await userEvent.click(advancedSwitch);
-
- expect(
- screen.queryByTestId("llm-settings-form-advanced"),
- ).toBeInTheDocument();
- expect(basicForm).not.toBeInTheDocument();
-
- const advancedForm = screen.getByTestId("llm-settings-form-advanced");
- within(advancedForm).getByTestId("llm-custom-model-input");
- within(advancedForm).getByTestId("base-url-input");
- within(advancedForm).getByTestId("llm-api-key-input");
- within(advancedForm).getByTestId("llm-api-key-help-anchor-advanced");
- within(advancedForm).getByTestId("enable-memory-condenser-switch");
+ it("uses schema defaults for custom-rendered advanced fields", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+ const baseUrlField = llmSection?.fields.find(
+ (field) => field.key === "llm.base_url",
+ );
- await userEvent.click(advancedSwitch);
- expect(
- screen.queryByTestId("llm-settings-form-advanced"),
- ).not.toBeInTheDocument();
- expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ if (!baseUrlField) {
+ throw new Error("Expected llm.base_url field in test schema");
+ }
+
+ baseUrlField.default = "https://schema.default/v1";
+ schema.sections.push({
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "agent",
+ label: "Agent",
+ section: "general",
+ section_label: "General",
+ value_type: "string",
+ default: "CodeActAgent",
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
});
- it("should render the default advanced settings", async () => {
- // V1 is always enabled, so no agent-input in the form
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- expect(advancedSwitch).not.toBeChecked();
-
- await userEvent.click(advancedSwitch);
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_base_url: "",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ },
+ },
+ agent_settings_schema: schema,
+ }),
+ );
- const model = screen.getByTestId("llm-custom-model-input");
- const baseUrl = screen.getByTestId("base-url-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
- const condensor = screen.getByTestId("enable-memory-condenser-switch");
+ renderLlmSettingsScreen({ appMode: "oss" });
- expect(model).toHaveValue("openhands/claude-opus-4-5-20251101");
- expect(baseUrl).toHaveValue("");
- expect(apiKey).toHaveValue("");
- expect(apiKey).toHaveProperty("placeholder", "");
- expect(condensor).toBeChecked();
- });
+ await screen.findByTestId("llm-settings-form-basic");
+ await userEvent.click(screen.getByTestId("sdk-section-advanced-toggle"));
- it("should render the advanced form if existings settings are advanced", async () => {
- const hasAdvancedSettingsSetSpy = vi.spyOn(
- AdvancedSettingsUtlls,
- "hasAdvancedSettingsSet",
- );
- hasAdvancedSettingsSetSpy.mockReturnValue(true);
+ expect(screen.getByTestId("base-url-input")).toHaveValue(
+ "https://schema.default/v1",
+ );
+ });
- renderLlmSettingsScreen();
+ it("keeps the current agent visible in advanced view when the schema omits agent choices", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
- await waitFor(() => {
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- expect(advancedSwitch).toBeChecked();
- screen.getByTestId("llm-settings-form-advanced");
- });
+ schema.sections.push({
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "agent",
+ label: "Agent",
+ section: "general",
+ section_label: "General",
+ value_type: "string",
+ default: "CodeActAgent",
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
});
- it("should render existing advanced settings correctly", async () => {
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
llm_model: "openai/gpt-4o",
- llm_base_url: "https://api.openai.com/v1/chat/completions",
- llm_api_key_set: true,
- confirmation_mode: true,
- enable_default_condenser: false,
- security_analyzer: "none",
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ llm_base_url: "https://custom.example/v1",
+ agent_settings_schema: schema,
+ agent_settings: {
+ agent: "BrowsingAgent",
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://custom.example/v1",
+ },
+ },
+ }),
+ );
- const model = screen.getByTestId("llm-custom-model-input");
- const baseUrl = screen.getByTestId("base-url-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
- const confirmation = screen.getByTestId(
- "enable-confirmation-mode-switch",
- );
- const condensor = screen.getByTestId("enable-memory-condenser-switch");
- const securityAnalyzer = screen.getByTestId("security-analyzer-input");
+ renderLlmSettingsScreen({ appMode: "oss" });
- await waitFor(() => {
- expect(model).toHaveValue("openai/gpt-4o");
- expect(baseUrl).toHaveValue(
- "https://api.openai.com/v1/chat/completions",
- );
- expect(apiKey).toHaveValue("");
- expect(apiKey).toHaveProperty("placeholder", "<hidden>");
- expect(confirmation).toBeChecked();
- expect(condensor).not.toBeChecked();
- expect(securityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_NONE");
- });
- });
+ await screen.findByTestId("llm-settings-form-advanced");
- it("should show custom security analyzers", async () => {
- // Mock the config to enable security analyzer functionality
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- confirmation_mode: true,
- security_analyzer: "llm",
+ await waitFor(() => {
+ expect(screen.getByTestId("agent-input")).toHaveValue("BrowsingAgent");
});
+ });
- const getSecurityAnalyzersSpy = vi.spyOn(
- OptionService,
- "getSecurityAnalyzers",
+ it("uses the docs.openhands.dev domain for the API key help link", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ },
+ },
+ }),
);
- // Only custom analyzer (not invariant which is filtered out)
- getSecurityAnalyzersSpy.mockResolvedValue(["llm", "none", "custom"]);
- renderLlmSettingsScreen();
+ renderLlmSettingsScreen({ appMode: "oss" });
+
await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
+ const helpLink = within(
+ screen.getByTestId("llm-settings-form-basic"),
+ ).getByTestId("llm-api-key-help-anchor");
- const securityAnalyzer = await screen.findByTestId(
- "security-analyzer-input",
+ expect(helpLink.querySelector("a")).toHaveAttribute(
+ "href",
+ "https://docs.openhands.dev/usage/local-setup#getting-an-api-key",
);
- await userEvent.click(securityAnalyzer);
-
- // Custom analyzers should be available, but invariant is filtered out
- screen.getByText("SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT");
- screen.getByText("SETTINGS$SECURITY_ANALYZER_NONE");
- expect(screen.getByText("custom")).toBeInTheDocument();
- });
});
- it.todo("should render an indicator if the llm api key is set");
+ it("defaults to basic view on first visit when org settings use a bare OpenAI model with the default base URL", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+
+ if (!llmSection) {
+ throw new Error("Expected llm section in test schema");
+ }
+
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ });
- describe("API key visibility in Basic Settings", () => {
- it("should hide API key input when SaaS mode is enabled and OpenHands provider is selected", async () => {
- // SaaS mode is already the default from beforeEach, but let's be explicit
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
+ schema.sections.push({
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "agent",
+ label: "Agent",
+ section: "general",
+ section_label: "General",
+ value_type: "string",
+ default: "CodeActAgent",
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
+ });
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ vi.spyOn(
+ organizationService,
+ "getOrganizationAgentSettings",
+ ).mockResolvedValue(
+ buildSettings({
+ llm_model: "gpt-4",
+ llm_base_url: "https://api.openai.com",
+ agent_settings_schema: schema,
+ agent_settings: {
+ agent: "CodeActAgent",
+ llm: {
+ model: "gpt-4",
+ base_url: "https://api.openai.com",
+ },
+ },
+ }),
+ );
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
+ renderLlmSettingsScreen({ appMode: "saas", scope: "org" });
- // Verify OpenHands is selected by default
- await waitFor(() => {
- expect(provider).toHaveValue("OpenHands");
- });
+ await screen.findByTestId("llm-settings-form-basic");
+ expect(
+ screen.queryByTestId("sdk-settings-llm.timeout"),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
+ });
- // API key input should not be visible when OpenHands provider is selected in SaaS mode
- expect(
- within(basicForm).queryByTestId("llm-api-key-input"),
- ).not.toBeInTheDocument();
- expect(
- within(basicForm).queryByTestId("llm-api-key-help-anchor"),
- ).not.toBeInTheDocument();
+ it("defaults to basic view on first personal SaaS visit even when effective settings include inherited org-only LLM fields", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+
+ if (!llmSection) {
+ throw new Error("Expected llm section in test schema");
+ }
+
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
});
- it("should show API key input when SaaS mode is enabled and non-OpenHands provider is selected", async () => {
- // SaaS mode is already the default from beforeEach, but let's be explicit
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "gpt-4",
+ llm_base_url: "https://api.openai.com",
+ agent_settings_schema: schema,
+ agent_settings: {
+ agent: "CodeActAgent",
+ llm: {
+ model: "gpt-4",
+ base_url: "https://api.openai.com",
+ timeout: 60,
+ },
+ },
+ }),
+ );
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ renderLlmSettingsScreen({ appMode: "saas" });
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
+ await screen.findByTestId("llm-settings-form-basic");
+ expect(
+ screen.queryByTestId("sdk-settings-llm.timeout"),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
+ });
- // Select OpenAI provider
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
+ it("hides the API key input for OpenHands provider in SaaS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
- });
+ renderLlmSettingsScreen({ appMode: "saas" });
- // API key input should be visible when non-OpenHands provider is selected in SaaS mode
- expect(
- within(basicForm).getByTestId("llm-api-key-input"),
- ).toBeInTheDocument();
- expect(
- within(basicForm).getByTestId("llm-api-key-help-anchor"),
- ).toBeInTheDocument();
- });
+ await screen.findByTestId("llm-settings-screen");
+ expect(screen.queryByTestId("llm-api-key-input")).not.toBeInTheDocument();
+ expect(screen.getByTestId("openhands-api-key-help")).toBeInTheDocument();
+ });
- it("should show API key input when OSS mode is enabled and OpenHands provider is selected", async () => {
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
+ it("shows the API key input for non-OpenHands providers in SaaS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ renderLlmSettingsScreen({ appMode: "saas" });
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
+ await screen.findByTestId("llm-settings-screen");
+ expect(screen.getByTestId("llm-api-key-input")).toBeInTheDocument();
+ });
- // Verify OpenHands is selected by default
- await waitFor(() => {
- expect(provider).toHaveValue("OpenHands");
- });
+ it("keeps personal settings editable for team members in SaaS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
- // API key input should be visible when OSS mode is enabled (even with OpenHands provider)
- expect(
- within(basicForm).getByTestId("llm-api-key-input"),
- ).toBeInTheDocument();
- expect(
- within(basicForm).getByTestId("llm-api-key-help-anchor"),
- ).toBeInTheDocument();
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ meData: buildOrganizationMember({ role: "member" }),
});
- it("should show API key input when OSS mode is enabled and non-OpenHands provider is selected", async () => {
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
+ await screen.findByTestId("llm-settings-screen");
+ expect(screen.getByTestId("save-button")).toBeInTheDocument();
+ });
- // Select OpenAI provider
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
+ describe("Contextual info messages", () => {
+ it("should show admin info message for admin user in team organization", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "3",
+ meData: buildOrganizationMember({ org_id: "3", role: "admin" }),
+ organizations: [buildOrganization({ id: "3", is_personal: false })],
});
- // API key input should be visible when OSS mode is enabled
expect(
- within(basicForm).getByTestId("llm-api-key-input"),
- ).toBeInTheDocument();
- expect(
- within(basicForm).getByTestId("llm-api-key-help-anchor"),
+ await screen.findByTestId("llm-settings-info-message"),
).toBeInTheDocument();
});
- it("should hide API key input when switching from non-OpenHands to OpenHands provider in SaaS mode", async () => {
- // SaaS mode is already the default from beforeEach, but let's be explicit
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
-
- // Start with OpenAI provider
- await userEvent.click(provider);
- const openAIOption = screen.getByText("OpenAI");
- await userEvent.click(openAIOption);
+ it("should show member info message for member user in team organization", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "2",
+ meData: buildOrganizationMember({ org_id: "2", role: "member" }),
+ organizations: [buildOrganization({ id: "2", is_personal: false })],
});
- // API key input should be visible with OpenAI
expect(
- within(basicForm).getByTestId("llm-api-key-input"),
+ await screen.findByTestId("llm-settings-info-message"),
).toBeInTheDocument();
+ });
- // Switch to OpenHands provider
- await userEvent.click(provider);
- const openHandsOption = screen.getByText("OpenHands");
- await userEvent.click(openHandsOption);
+ it("should not show info message for personal workspace", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- await waitFor(() => {
- expect(provider).toHaveValue("OpenHands");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "1",
+ meData: buildOrganizationMember({ org_id: "1", role: "owner" }),
+ organizations: [buildOrganization({ id: "1", is_personal: true })],
});
- // API key input should now be hidden
+ await screen.findByTestId("llm-settings-screen");
expect(
- within(basicForm).queryByTestId("llm-api-key-input"),
- ).not.toBeInTheDocument();
- expect(
- within(basicForm).queryByTestId("llm-api-key-help-anchor"),
+ screen.queryByTestId("llm-settings-info-message"),
).not.toBeInTheDocument();
});
- it("should show API key input when switching from OpenHands to non-OpenHands provider in SaaS mode", async () => {
- // SaaS mode is already the default from beforeEach, but let's be explicit
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- const provider = within(basicForm).getByTestId("llm-provider-input");
+ it("should not show info message in OSS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- // Verify OpenHands is selected by default
- await waitFor(() => {
- expect(provider).toHaveValue("OpenHands");
- });
+ renderLlmSettingsScreen({ appMode: "oss" });
- // API key input should be hidden with OpenHands
+ await screen.findByTestId("llm-settings-screen");
expect(
- within(basicForm).queryByTestId("llm-api-key-input"),
+ screen.queryByTestId("llm-settings-info-message"),
).not.toBeInTheDocument();
-
- // Switch to OpenAI provider
- await userEvent.click(provider);
- const openAIOption = screen.getByText("OpenAI");
- await userEvent.click(openAIOption);
-
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
- });
-
- // API key input should now be visible
- expect(
- within(basicForm).getByTestId("llm-api-key-input"),
- ).toBeInTheDocument();
- expect(
- within(basicForm).getByTestId("llm-api-key-help-anchor"),
- ).toBeInTheDocument();
});
});
-});
-
-describe("Form submission", () => {
- it("should submit the basic form with the correct values", async () => {
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- const provider = screen.getByTestId("llm-provider-input");
- const model = screen.getByTestId("llm-model-input");
-
- // select provider (switch to OpenAI so API key input becomes visible)
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
- });
-
- // enter api key (now visible after switching provider)
- const apiKey = await screen.findByTestId("llm-api-key-input");
- await userEvent.type(apiKey, "test-api-key");
-
- // select model
- await userEvent.click(model);
- const modelOption = screen.getByText("gpt-4o");
- await userEvent.click(modelOption);
- expect(model).toHaveValue("gpt-4o");
-
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
-
- expect(saveSettingsSpy).toHaveBeenCalledWith(
- expect.objectContaining({
+ it("submits basic form values through SDK setting keys", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
llm_model: "openai/gpt-4o",
- llm_api_key: "test-api-key",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
}),
);
- });
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
- it("should submit the advanced form with the correct values", async () => {
- // V1 is always enabled, so no agent-input in the form
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
+ renderLlmSettingsScreen({ appMode: "oss" });
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
-
- const model = screen.getByTestId("llm-custom-model-input");
- const baseUrl = screen.getByTestId("base-url-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
- const confirmation = screen.getByTestId("enable-confirmation-mode-switch");
- const condensor = screen.getByTestId("enable-memory-condenser-switch");
-
- // enter custom model
- await userEvent.clear(model);
- await userEvent.type(model, "openai/gpt-4o");
- expect(model).toHaveValue("openai/gpt-4o");
-
- // enter base url
- await userEvent.type(baseUrl, "https://api.openai.com/v1/chat/completions");
- expect(baseUrl).toHaveValue("https://api.openai.com/v1/chat/completions");
-
- // enter api key
- await userEvent.type(apiKey, "test-api-key");
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({ api_key: "test-api-key" }),
+ }),
+ }),
+ );
+ });
+ });
- // toggle confirmation mode
- await userEvent.click(confirmation);
- expect(confirmation).toBeChecked();
+ it("resets hidden advanced and all settings back to defaults when saving basic view", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
- // toggle memory condensor
- await userEvent.click(condensor);
- expect(condensor).not.toBeChecked();
+ if (!llmSection) {
+ throw new Error("Expected llm section in test schema");
+ }
- // select security analyzer
- const securityAnalyzer = screen.getByTestId("security-analyzer-input");
- await userEvent.click(securityAnalyzer);
- const securityAnalyzerOption = screen.getByText(
- "SETTINGS$SECURITY_ANALYZER_NONE",
+ const baseUrlField = llmSection.fields.find(
+ (field) => field.key === "llm.base_url",
);
- await userEvent.click(securityAnalyzerOption);
+ if (!baseUrlField) {
+ throw new Error("Expected llm.base_url field in test schema");
+ }
+ baseUrlField.default = "https://schema.default/v1";
+
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ });
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ schema.sections.push({
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "agent",
+ label: "Agent",
+ section: "general",
+ section_label: "General",
+ value_type: "string",
+ default: "CodeActAgent",
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
+ });
- expect(saveSettingsSpy).toHaveBeenCalledWith(
- expect.objectContaining({
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
llm_model: "openai/gpt-4o",
- llm_base_url: "https://api.openai.com/v1/chat/completions",
- confirmation_mode: true,
- enable_default_condenser: false,
- security_analyzer: null,
+ llm_base_url: "https://custom.example/v1",
+ agent_settings_schema: schema,
+ agent_settings: {
+ agent: "BrowsingAgent",
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://custom.example/v1",
+ timeout: 90,
+ },
+ },
}),
);
- });
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
- it("should disable the button if there are no changes in the basic form", async () => {
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- llm_model: "openai/gpt-4o",
- llm_api_key_set: true,
- });
+ renderLlmSettingsScreen({ appMode: "oss" });
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
- screen.getByTestId("llm-settings-form-basic");
-
- const submitButton = screen.getByTestId("submit-button");
- expect(submitButton).toBeDisabled();
-
- const model = screen.getByTestId("llm-model-input");
- const apiKey = screen.getByTestId("llm-api-key-input");
-
- // select model
- await userEvent.click(model);
- const modelOption = screen.getByText("gpt-4o-mini");
- await userEvent.click(modelOption);
- expect(model).toHaveValue("gpt-4o-mini");
- expect(submitButton).not.toBeDisabled();
-
- // reset model
- await userEvent.click(model);
- const modelOption2 = screen.getByText("gpt-4o");
- await userEvent.click(modelOption2);
- expect(model).toHaveValue("gpt-4o");
- expect(submitButton).toBeDisabled();
-
- // set api key
- await userEvent.type(apiKey, "test-api-key");
- expect(apiKey).toHaveValue("test-api-key");
- expect(submitButton).not.toBeDisabled();
-
- // reset api key
- await userEvent.clear(apiKey);
- expect(apiKey).toHaveValue("");
- expect(submitButton).toBeDisabled();
- });
+ await screen.findByTestId("llm-settings-form-advanced");
+ await userEvent.click(screen.getByTestId("sdk-section-basic-toggle"));
+
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
- it("should disable the button if there are no changes in the advanced form", async () => {
- // V1 is always enabled, so no agent-input in the form
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ agent: "CodeActAgent",
+ llm: expect.objectContaining({
+ api_key: "test-api-key",
+ base_url: "https://schema.default/v1",
+ timeout: 30,
+ }),
+ }),
+ }),
+ );
});
+ });
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ it("clears hidden search API key state when saving basic view", async () => {
+ let persistedSettings = buildSettingsWithAdvancedToggle({
llm_model: "openai/gpt-4o",
- llm_base_url: "https://api.openai.com/v1/chat/completions",
- llm_api_key_set: true,
- confirmation_mode: true,
+ search_api_key: "tavily-key",
+ search_api_key_set: true,
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ },
+ },
});
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
- await screen.findByTestId("llm-settings-form-advanced");
-
- const submitButton = await screen.findByTestId("submit-button");
- expect(submitButton).toBeDisabled();
-
- const model = await screen.findByTestId("llm-custom-model-input");
- const baseUrl = await screen.findByTestId("base-url-input");
- const apiKey = await screen.findByTestId("llm-api-key-input");
- const condensor = await screen.findByTestId(
- "enable-memory-condenser-switch",
- );
-
- // Confirmation mode switch is now in basic settings, always visible
- const confirmation = await screen.findByTestId(
- "enable-confirmation-mode-switch",
- );
-
- // enter custom model
- await userEvent.type(model, "-mini");
- expect(model).toHaveValue("openai/gpt-4o-mini");
- expect(submitButton).not.toBeDisabled();
-
- // reset model
- await userEvent.clear(model);
- expect(model).toHaveValue("");
- expect(submitButton).toBeDisabled();
-
- await userEvent.type(model, "openai/gpt-4o");
- expect(model).toHaveValue("openai/gpt-4o");
- expect(submitButton).toBeDisabled();
-
- // enter base url
- await userEvent.type(baseUrl, "/extra");
- expect(baseUrl).toHaveValue(
- "https://api.openai.com/v1/chat/completions/extra",
- );
- expect(submitButton).not.toBeDisabled();
-
- await userEvent.clear(baseUrl);
- expect(baseUrl).toHaveValue("");
- expect(submitButton).not.toBeDisabled();
-
- await userEvent.type(baseUrl, "https://api.openai.com/v1/chat/completions");
- expect(baseUrl).toHaveValue("https://api.openai.com/v1/chat/completions");
- expect(submitButton).toBeDisabled();
-
- // set api key
- await userEvent.type(apiKey, "test-api-key");
- expect(apiKey).toHaveValue("test-api-key");
- expect(submitButton).not.toBeDisabled();
-
- // reset api key
- await userEvent.clear(apiKey);
- expect(apiKey).toHaveValue("");
- expect(submitButton).toBeDisabled();
-
- // toggle confirmation mode
- await userEvent.click(confirmation);
- expect(confirmation).not.toBeChecked();
- expect(submitButton).not.toBeDisabled();
- await userEvent.click(confirmation);
- expect(confirmation).toBeChecked();
- expect(submitButton).toBeDisabled();
-
- // toggle memory condensor
- await userEvent.click(condensor);
- expect(condensor).not.toBeChecked();
- expect(submitButton).not.toBeDisabled();
- await userEvent.click(condensor);
- expect(condensor).toBeChecked();
- expect(submitButton).toBeDisabled();
-
- // select security analyzer
- const securityAnalyzer = await screen.findByTestId(
- "security-analyzer-input",
- );
- await userEvent.click(securityAnalyzer);
- const securityAnalyzerOption = screen.getByText(
- "SETTINGS$SECURITY_ANALYZER_NONE",
- );
- await userEvent.click(securityAnalyzerOption);
- expect(securityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_NONE");
-
- expect(submitButton).not.toBeDisabled();
-
- // revert back to original value
- await userEvent.click(securityAnalyzer);
- const originalSecurityAnalyzerOption = screen.getByText(
- "SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT",
- );
- await userEvent.click(originalSecurityAnalyzerOption);
- expect(securityAnalyzer).toHaveValue(
- "SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT",
- );
- expect(submitButton).toBeDisabled();
- });
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockImplementation(async (payload) => {
+ const nextAgentSettings = {
+ ...persistedSettings.agent_settings,
+ } as NonNullable<Settings["agent_settings"]>;
+
+ Object.entries(payload).forEach(([key, value]) => {
+ if (key.includes(".") || key === "agent" || key === "mcp_config") {
+ nextAgentSettings[key] = value as SettingsValue;
+ }
+ });
+
+ const nextSearchApiKey =
+ typeof payload.search_api_key === "string"
+ ? payload.search_api_key
+ : (persistedSettings.search_api_key ?? "");
+
+ persistedSettings = buildSettings({
+ ...persistedSettings,
+ search_api_key: nextSearchApiKey,
+ search_api_key_set: nextSearchApiKey.trim().length > 0,
+ agent_settings: nextAgentSettings,
+ });
+
+ return true;
+ });
- it("should reset button state when switching between forms", async () => {
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ renderLlmSettingsScreen({ appMode: "oss" });
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- const submitButton = screen.getByTestId("submit-button");
+ await screen.findByTestId("llm-settings-form-basic");
- expect(submitButton).toBeDisabled();
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
- // Switch to a non-OpenHands provider first so API key input is visible
- const provider = screen.getByTestId("llm-provider-input");
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ search_api_key: "",
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({ api_key: "test-api-key" }),
+ }),
+ }),
+ );
});
- // dirty the basic form
- const apiKey = await screen.findByTestId("llm-api-key-input");
- await userEvent.type(apiKey, "test-api-key");
- expect(submitButton).not.toBeDisabled();
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
- await userEvent.click(advancedSwitch);
- expect(submitButton).toBeDisabled();
+ await waitFor(() => {
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
+ });
+ });
- // dirty the advanced form
- const model = screen.getByTestId("llm-custom-model-input");
- await userEvent.type(model, "openai/gpt-4o");
- expect(submitButton).not.toBeDisabled();
+ it("keeps the basic view after save on SaaS personal settings when an inherited org search API key remains set on refetch", async () => {
+ let persistedSettings = buildSettingsWithAdvancedToggle({
+ llm_model: "openai/gpt-4o",
+ search_api_key_set: true,
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ },
+ },
+ });
- await userEvent.click(advancedSwitch);
- expect(submitButton).toBeDisabled();
- });
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockImplementation(async (payload) => {
+ const nextAgentSettings = {
+ ...persistedSettings.agent_settings,
+ } as NonNullable<Settings["agent_settings"]>;
+
+ Object.entries(payload).forEach(([key, value]) => {
+ if (key.includes(".") || key === "agent" || key === "mcp_config") {
+ nextAgentSettings[key] = value as SettingsValue;
+ }
+ });
+
+ persistedSettings = buildSettingsWithAdvancedToggle({
+ ...persistedSettings,
+ search_api_key: "",
+ search_api_key_set: true,
+ agent_settings: nextAgentSettings,
+ });
+
+ return true;
+ });
- // flaky test
- it.skip("should disable the button when submitting changes", async () => {
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
+ renderLlmSettingsScreen({ appMode: "saas" });
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ await screen.findByTestId("llm-settings-form-basic");
- const apiKey = screen.getByTestId("llm-api-key-input");
- await userEvent.type(apiKey, "test-api-key");
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({ api_key: "test-api-key" }),
+ }),
+ }),
+ );
+ });
- expect(saveSettingsSpy).toHaveBeenCalledWith(
- expect.objectContaining({
- llm_api_key: "test-api-key",
- }),
- );
+ const payload = saveSettingsSpy.mock.calls[0]?.[0] as Record<
+ string,
+ unknown
+ >;
+ expect(payload).not.toHaveProperty("search_api_key");
- expect(submitButton).toHaveTextContent("Saving...");
- expect(submitButton).toBeDisabled();
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
await waitFor(() => {
- expect(submitButton).toHaveTextContent("Save");
- expect(submitButton).toBeDisabled();
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
});
});
- it("should clear advanced settings when saving basic settings", async () => {
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ it("does not clear the hidden search API key on SaaS org settings when saving basic view", async () => {
+ let persistedSettings = buildSettingsWithAdvancedToggle({
llm_model: "openai/gpt-4o",
- llm_base_url: "https://api.openai.com/v1/chat/completions",
- llm_api_key_set: true,
- confirmation_mode: true,
+ llm_base_url: "https://custom.example/v1",
+ search_api_key: "****1234",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://custom.example/v1",
+ },
+ },
});
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
- // Component automatically shows advanced view when advanced settings exist
- // Switch to basic view to test clearing advanced settings
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
+ const getOrganizationSettingsSpy = vi
+ .spyOn(organizationService, "getOrganizationAgentSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ const saveOrganizationSettingsSpy = vi
+ .spyOn(organizationService, "saveOrganizationAgentSettings")
+ .mockImplementation(async (payload) => {
+ const nextAgentSettings = {
+ ...persistedSettings.agent_settings,
+ } as NonNullable<Settings["agent_settings"]>;
+
+ Object.entries(payload).forEach(([key, value]) => {
+ if (key.includes(".") || key === "agent" || key === "mcp_config") {
+ nextAgentSettings[key] = value as SettingsValue;
+ }
+ });
+
+ persistedSettings = buildSettingsWithAdvancedToggle({
+ ...persistedSettings,
+ llm_base_url: "",
+ search_api_key: "****1234",
+ agent_settings: nextAgentSettings,
+ });
+
+ return persistedSettings;
+ });
- // Now we should be in basic view
- await screen.findByTestId("llm-settings-form-basic");
+ renderLlmSettingsScreen({ appMode: "saas", scope: "org" });
- const provider = screen.getByTestId("llm-provider-input");
- const model = screen.getByTestId("llm-model-input");
+ await screen.findByTestId("llm-settings-form-advanced");
+ await userEvent.click(screen.getByTestId("sdk-section-basic-toggle"));
- // select provider
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenHands");
- await userEvent.click(providerOption);
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
- // select model
- await userEvent.click(model);
- const modelOption = screen.getByText("claude-sonnet-4-20250514");
- await userEvent.click(modelOption);
+ await waitFor(() => {
+ expect(saveOrganizationSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({
+ api_key: "test-api-key",
+ base_url: null,
+ }),
+ }),
+ }),
+ );
+ });
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ const payload = saveOrganizationSettingsSpy.mock.calls[0]?.at(0) as Record<
+ string,
+ unknown
+ >;
+ expect(payload).not.toHaveProperty("search_api_key");
- expect(saveSettingsSpy).toHaveBeenCalledWith(
- expect.objectContaining({
- llm_model: "openhands/claude-sonnet-4-20250514",
- llm_base_url: "",
- confirmation_mode: false, // Confirmation mode is now an advanced setting, should be cleared when saving basic settings
- }),
- );
+ await waitFor(() => {
+ expect(getOrganizationSettingsSpy).toHaveBeenCalledTimes(2);
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
+ });
});
-});
-describe("View persistence after saving advanced settings", () => {
- it("should remain on Advanced view after saving when memory condenser is disabled", async () => {
- // Arrange: Start with default settings (basic view)
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ it("keeps the basic view after save when a stale legacy base URL lingers on refetch", async () => {
+ let persistedSettings = buildSettingsWithAdvancedToggle({
+ llm_base_url: "https://stale.example/v1",
+ agent_settings: {
+ llm: {
+ base_url: "https://stale.example/v1",
+ },
+ },
});
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- saveSettingsSpy.mockResolvedValue(true);
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockImplementation(async (payload) => {
+ const nextAgentSettings = {
+ ...persistedSettings.agent_settings,
+ } as NonNullable<Settings["agent_settings"]>;
+
+ Object.entries(payload).forEach(([key, value]) => {
+ if (key.includes(".") || key === "agent" || key === "mcp_config") {
+ nextAgentSettings[key] = value as SettingsValue;
+ }
+ });
+
+ persistedSettings = buildSettingsWithAdvancedToggle({
+ ...persistedSettings,
+ agent_settings: nextAgentSettings,
+ });
+
+ return true;
+ });
- // Verify we start in basic view
- expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ renderLlmSettingsScreen({ appMode: "oss" });
- // Act: User manually switches to Advanced view
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
await screen.findByTestId("llm-settings-form-advanced");
+ await userEvent.click(screen.getByTestId("sdk-section-basic-toggle"));
- // User disables memory condenser (advanced-only setting)
- const condenserSwitch = screen.getByTestId(
- "enable-memory-condenser-switch",
- );
- expect(condenserSwitch).toBeChecked();
- await userEvent.click(condenserSwitch);
- expect(condenserSwitch).not.toBeChecked();
-
- // Mock the updated settings that will be returned after save
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- enable_default_condenser: false, // Now disabled
+ const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ await userEvent.type(apiKeyInput, "test-api-key");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({
+ api_key: "test-api-key",
+ base_url: null,
+ }),
+ }),
+ }),
+ );
});
- // User saves settings
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
- // Assert: View should remain on Advanced after save
await waitFor(() => {
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
expect(
- screen.getByTestId("llm-settings-form-advanced"),
- ).toBeInTheDocument();
- expect(
- screen.queryByTestId("llm-settings-form-basic"),
+ screen.queryByTestId("llm-settings-form-advanced"),
).not.toBeInTheDocument();
- expect(advancedSwitch).toBeChecked();
});
});
- it("should remain on Advanced view after saving when condenser max size is customized", async () => {
- // Arrange: Start with default settings
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
+ it("keeps the basic view after saving a basic model change when refetch includes a provider base URL", async () => {
+ let persistedSettings = buildSettingsWithAdvancedToggle();
+
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockImplementation(async (payload) => {
+ const nextAgentSettings = {
+ ...persistedSettings.agent_settings,
+ } as NonNullable<Settings["agent_settings"]>;
+
+ Object.entries(payload).forEach(([key, value]) => {
+ if (key.includes(".") || key === "agent" || key === "mcp_config") {
+ nextAgentSettings[key] = value as SettingsValue;
+ }
+ });
+
+ persistedSettings = buildSettingsWithAdvancedToggle({
+ ...persistedSettings,
+ llm_model: "openai/gpt-4o",
+ llm_base_url: "https://api.openai.com/v1",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://api.openai.com/v1",
+ },
+ },
+ });
+
+ return true;
+ });
+
+ renderLlmSettingsScreen({ appMode: "oss" });
+
+ await screen.findByTestId("llm-settings-form-basic");
+ await selectProvider("OpenAI");
+ await selectModel("gpt-4o");
+ await userEvent.type(
+ await screen.findByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({
+ model: "openai/gpt-4o",
+ api_key: "test-api-key",
+ }),
+ }),
+ }),
+ );
});
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- saveSettingsSpy.mockResolvedValue(true);
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
- // Act: User manually switches to Advanced view
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
- await screen.findByTestId("llm-settings-form-advanced");
+ await waitFor(() => {
+ expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("llm-settings-form-advanced"),
+ ).not.toBeInTheDocument();
+ });
+ });
- // User sets custom condenser max size (advanced-only setting)
- const condenserMaxSizeInput = screen.getByTestId(
- "condenser-max-size-input",
+ it("keeps the advanced view while typing into the search API key field", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettingsWithAdvancedToggle(),
);
- await userEvent.clear(condenserMaxSizeInput);
- await userEvent.type(condenserMaxSizeInput, "200");
- // Mock the updated settings that will be returned after save
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- condenser_max_size: 200, // Custom value
- });
+ renderLlmSettingsScreen({ appMode: "oss" });
+
+ await screen.findByTestId("llm-settings-form-basic");
+ await userEvent.click(screen.getByTestId("sdk-section-advanced-toggle"));
- // User saves settings
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ const searchApiKeyInput = await screen.findByTestId("search-api-key-input");
+ await userEvent.type(searchApiKeyInput, "a");
- // Assert: View should remain on Advanced after save
await waitFor(() => {
+ expect(searchApiKeyInput).toHaveValue("a");
expect(
screen.getByTestId("llm-settings-form-advanced"),
).toBeInTheDocument();
expect(
screen.queryByTestId("llm-settings-form-basic"),
).not.toBeInTheDocument();
- expect(advancedSwitch).toBeChecked();
});
});
- it("should remain on Advanced view after saving when search API key is set", async () => {
- // Arrange: Start with default settings (non-SaaS mode to show search API key field)
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
+ it("does not reveal all-only fields after save when the search API key remains set on refetch", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+
+ if (!llmSection) {
+ throw new Error("Expected llm section in test schema");
+ }
+
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
});
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- search_api_key: "", // Default empty value
+ schema.sections.push({
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "agent",
+ label: "Agent",
+ section: "general",
+ section_label: "General",
+ value_type: "string",
+ default: "CodeActAgent",
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
});
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- saveSettingsSpy.mockResolvedValue(true);
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ let persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ search_api_key: "",
+ search_api_key_set: false,
+ agent_settings: {
+ llm: {
+ model: "openhands/claude-opus-4-5-20251101",
+ },
+ },
+ });
- // Act: User manually switches to Advanced view
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
- await screen.findByTestId("llm-settings-form-advanced");
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ vi.spyOn(SettingsService, "saveSettings").mockImplementation(
+ async (payload) => {
+ const nextSearchApiKey =
+ typeof payload.search_api_key === "string"
+ ? payload.search_api_key
+ : "";
+
+ persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ search_api_key: nextSearchApiKey,
+ search_api_key_set: nextSearchApiKey.trim().length > 0,
+ agent_settings: {
+ llm: {
+ model: "openhands/claude-opus-4-5-20251101",
+ },
+ },
+ });
+
+ return true;
+ },
+ );
- // User sets search API key (advanced-only setting)
- const searchApiKeyInput = screen.getByTestId("search-api-key-input");
- await userEvent.type(searchApiKeyInput, "test-search-api-key");
+ renderLlmSettingsScreen({ appMode: "oss" });
- // Mock the updated settings that will be returned after save
- getSettingsSpy.mockResolvedValue({
- ...MOCK_DEFAULT_USER_SETTINGS,
- search_api_key: "test-search-api-key", // Now set
- });
+ await screen.findByTestId("llm-settings-form-basic");
+ await userEvent.click(screen.getByTestId("sdk-section-advanced-toggle"));
+ expect(
+ screen.queryByTestId("sdk-settings-llm.timeout"),
+ ).not.toBeInTheDocument();
- // User saves settings
- const submitButton = screen.getByTestId("submit-button");
- await userEvent.click(submitButton);
+ const searchApiKeyInput = await screen.findByTestId("search-api-key-input");
+ await userEvent.type(searchApiKeyInput, "tavily-key");
+ await userEvent.click(screen.getByTestId("save-button"));
+
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
+ });
- // Assert: View should remain on Advanced after save
await waitFor(() => {
expect(
- screen.getByTestId("llm-settings-form-advanced"),
- ).toBeInTheDocument();
- expect(
- screen.queryByTestId("llm-settings-form-basic"),
+ screen.queryByTestId("sdk-settings-llm.timeout"),
).not.toBeInTheDocument();
- expect(advancedSwitch).toBeChecked();
});
});
-});
-describe("Status toasts", () => {
- describe("Basic form", () => {
- it("should call displaySuccessToast when the settings are saved", async () => {
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- const displaySuccessToastSpy = vi.spyOn(
- ToastHandlers,
- "displaySuccessToast",
- );
+ it("does not reveal all-only fields after save when refetch returns a litellm_proxy model with the managed proxy base URL", async () => {
+ const schema = structuredClone(
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema!,
+ );
+ const llmSection = schema.sections.find((section) => section.key === "llm");
+
+ if (!llmSection) {
+ throw new Error("Expected llm section in test schema");
+ }
+
+ llmSection.fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ });
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ let persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ model: "openhands/claude-opus-4-5-20251101",
+ },
+ },
+ });
- // Switch to a non-OpenHands provider so API key input is visible
- const provider = screen.getByTestId("llm-provider-input");
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
+ const getSettingsSpy = vi
+ .spyOn(SettingsService, "getSettings")
+ .mockImplementation(async () => structuredClone(persistedSettings));
+ vi.spyOn(SettingsService, "saveSettings").mockImplementation(async () => {
+ persistedSettings = buildSettings({
+ agent_settings_schema: schema,
+ agent_settings: {
+ llm: {
+ model: "litellm_proxy/claude-opus-4-5-20251101",
+ base_url: "https://llm-proxy.app.all-hands.dev",
+ },
+ },
});
- // Wait for API key input to appear
- const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ return true;
+ });
- // Also change the model to ensure form is dirty
- const model = screen.getByTestId("llm-model-input");
- await userEvent.click(model);
- const modelOption = screen.getByText("gpt-4o");
- await userEvent.click(modelOption);
- await waitFor(() => {
- expect(model).toHaveValue("gpt-4o");
- });
+ renderLlmSettingsScreen({ appMode: "oss" });
- // Enter API key
- await userEvent.type(apiKeyInput, "test-api-key");
+ await screen.findByTestId("llm-settings-form-basic");
+ expect(
+ screen.queryByTestId("sdk-settings-llm.timeout"),
+ ).not.toBeInTheDocument();
- // Wait for submit button to be enabled
- const submit = await screen.findByTestId("submit-button");
- await waitFor(() => {
- expect(submit).not.toBeDisabled();
- });
- await userEvent.click(submit);
+ await userEvent.type(
+ await screen.findByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
+ await userEvent.click(screen.getByTestId("save-button"));
- expect(saveSettingsSpy).toHaveBeenCalled();
- await waitFor(() => expect(displaySuccessToastSpy).toHaveBeenCalled());
+ await waitFor(() => {
+ expect(getSettingsSpy).toHaveBeenCalledTimes(2);
});
- it("should call displayErrorToast when the settings fail to save", async () => {
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- const displayErrorToastSpy = vi.spyOn(ToastHandlers, "displayErrorToast");
-
- saveSettingsSpy.mockRejectedValue(new Error("Failed to save settings"));
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
+ await waitFor(() => {
+ expect(
+ screen.queryByTestId("sdk-settings-llm.timeout"),
+ ).not.toBeInTheDocument();
+ });
+ });
- // Switch to a non-OpenHands provider so API key input is visible
- const provider = screen.getByTestId("llm-provider-input");
- await userEvent.click(provider);
- const providerOption = screen.getByText("OpenAI");
- await userEvent.click(providerOption);
- await waitFor(() => {
- expect(provider).toHaveValue("OpenAI");
- });
+ it("submits advanced form values through SDK setting keys", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: {
+ llm: {
+ model: "openai/gpt-4o",
+ base_url: "https://custom.example/v1",
+ },
+ },
+ }),
+ );
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
- // Wait for API key input to appear
- const apiKeyInput = await screen.findByTestId("llm-api-key-input");
+ renderLlmSettingsScreen({ appMode: "oss" });
- // Also change the model to ensure form is dirty
- const model = screen.getByTestId("llm-model-input");
- await userEvent.click(model);
- const modelOption = screen.getByText("gpt-4o");
- await userEvent.click(modelOption);
- await waitFor(() => {
- expect(model).toHaveValue("gpt-4o");
- });
+ const baseUrlInput = await screen.findByTestId("base-url-input");
+ await userEvent.type(baseUrlInput, "/extra");
- // Enter API key
- await userEvent.type(apiKeyInput, "test-api-key");
+ await waitFor(() => {
+ expect(baseUrlInput).toHaveValue("https://custom.example/v1/extra");
+ expect(screen.getByTestId("save-button")).not.toBeDisabled();
+ });
- // Wait for submit button to be enabled
- const submit = await screen.findByTestId("submit-button");
- await waitFor(() => {
- expect(submit).not.toBeDisabled();
- });
- await userEvent.click(submit);
+ await userEvent.click(screen.getByTestId("save-button"));
- expect(saveSettingsSpy).toHaveBeenCalled();
- expect(displayErrorToastSpy).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent_settings: expect.objectContaining({
+ llm: expect.objectContaining({
+ base_url: "https://custom.example/v1/extra",
+ }),
+ }),
+ }),
+ );
});
});
- describe("Advanced form", () => {
- it("should call displaySuccessToast when the settings are saved", async () => {
- // Use OSS mode to ensure API key input is visible
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- const displaySuccessToastSpy = vi.spyOn(
- ToastHandlers,
- "displaySuccessToast",
+ describe("API key visibility in Basic Settings", () => {
+ it("should hide API key input when SaaS mode is enabled and OpenHands provider is selected", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
);
- renderLlmSettingsScreen();
+ renderLlmSettingsScreen({ appMode: "saas" });
await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
- await screen.findByTestId("llm-settings-form-advanced");
-
- // Toggle setting to change
- const apiKeyInput = await screen.findByTestId("llm-api-key-input");
- await userEvent.type(apiKeyInput, "test-api-key");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput = within(basicForm).getByTestId("llm-provider-input");
- // Wait for submit button to be enabled
- const submit = await screen.findByTestId("submit-button");
await waitFor(() => {
- expect(submit).not.toBeDisabled();
+ expect(providerInput).toHaveValue("OpenHands");
});
- await userEvent.click(submit);
- expect(saveSettingsSpy).toHaveBeenCalled();
- await waitFor(() => expect(displaySuccessToastSpy).toHaveBeenCalled());
+ expect(
+ within(basicForm).queryByTestId("llm-api-key-input"),
+ ).not.toBeInTheDocument();
+ expect(
+ within(basicForm).queryByTestId("llm-api-key-help-anchor"),
+ ).not.toBeInTheDocument();
});
- it("should call displayErrorToast when the settings fail to save", async () => {
- // Use OSS mode to ensure API key input is visible
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
-
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- const displayErrorToastSpy = vi.spyOn(ToastHandlers, "displayErrorToast");
-
- saveSettingsSpy.mockRejectedValue(new Error("Failed to save settings"));
+ it("should show API key input when SaaS mode is enabled and non-OpenHands provider is selected", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- renderLlmSettingsScreen();
+ renderLlmSettingsScreen({ appMode: "saas" });
await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- await userEvent.click(advancedSwitch);
- await screen.findByTestId("llm-settings-form-advanced");
-
- // Toggle setting to change
- const apiKeyInput = await screen.findByTestId("llm-api-key-input");
- await userEvent.type(apiKeyInput, "test-api-key");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput = within(basicForm).getByTestId("llm-provider-input");
- // Wait for submit button to be enabled
- const submit = await screen.findByTestId("submit-button");
await waitFor(() => {
- expect(submit).not.toBeDisabled();
+ expect(providerInput).toHaveValue("OpenAI");
});
- await userEvent.click(submit);
-
- expect(saveSettingsSpy).toHaveBeenCalled();
- expect(displayErrorToastSpy).toHaveBeenCalled();
- });
- });
-});
-describe("Role-based permissions", () => {
- const getMeSpy = vi.spyOn(organizationService, "getMe");
-
- beforeEach(() => {
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
- });
-
- describe("User role (read-only)", () => {
- const memberData: OrganizationMember = {
- org_id: "2",
- user_id: "99",
- email: "[email protected]",
- role: "member",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
- };
-
- beforeEach(() => {
- // Mock user role
- getMeSpy.mockResolvedValue(memberData);
+ expect(
+ within(basicForm).getByTestId("llm-api-key-input"),
+ ).toBeInTheDocument();
+ expect(
+ within(basicForm).getByTestId("llm-api-key-help-anchor"),
+ ).toBeInTheDocument();
});
- it("should disable all input fields in basic view", async () => {
- // Arrange
- renderLlmSettingsScreen("2", memberData); // orgId "2" returns user role
+ it("should show API key input when OSS mode is enabled and OpenHands provider is selected", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- // Act
+ renderLlmSettingsScreen({ appMode: "oss" });
await screen.findByTestId("llm-settings-screen");
- const basicForm = screen.getByTestId("llm-settings-form-basic");
- // Assert
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
const providerInput = within(basicForm).getByTestId("llm-provider-input");
- const modelInput = within(basicForm).getByTestId("llm-model-input");
await waitFor(() => {
- expect(providerInput).toBeDisabled();
- expect(modelInput).toBeDisabled();
+ expect(providerInput).toHaveValue("OpenHands");
});
- // API key input may be hidden if OpenHands provider is selected in SaaS mode
- // If it exists, it should be disabled
- const apiKeyInput = within(basicForm).queryByTestId("llm-api-key-input");
- if (apiKeyInput) {
- expect(apiKeyInput).toBeDisabled();
- }
+ expect(
+ within(basicForm).getByTestId("llm-api-key-input"),
+ ).toBeInTheDocument();
+ expect(
+ within(basicForm).getByTestId("llm-api-key-help-anchor"),
+ ).toBeInTheDocument();
});
- // Note: No "should disable all input fields in advanced view" test for members
- // because members cannot access the advanced view (the toggle is disabled).
-
- it("should not render submit button", async () => {
- // Arrange
- renderLlmSettingsScreen("2", memberData);
+ it("should show API key input when OSS mode is enabled and non-OpenHands provider is selected", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Act
+ renderLlmSettingsScreen({ appMode: "oss" });
await screen.findByTestId("llm-settings-screen");
- const submitButton = screen.queryByTestId("submit-button");
-
- // Assert
- expect(submitButton).not.toBeInTheDocument();
- });
-
- it("should disable the advanced/basic toggle for read-only users", async () => {
- // Arrange
- renderLlmSettingsScreen("2", memberData);
- // Act
- await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput = within(basicForm).getByTestId("llm-provider-input");
- // Assert - toggle should be disabled for members who lack edit_llm_settings
await waitFor(() => {
- expect(advancedSwitch).toBeDisabled();
+ expect(providerInput).toHaveValue("OpenAI");
});
- // Basic form should remain visible (members can't switch to advanced)
- expect(screen.getByTestId("llm-settings-form-basic")).toBeInTheDocument();
- });
- });
-
- describe("Owner role (full access)", () => {
- beforeEach(() => {
- // Mock owner role
- getMeSpy.mockResolvedValue({
- org_id: "1",
- user_id: "99",
- email: "[email protected]",
- role: "owner",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
- });
+ expect(
+ within(basicForm).getByTestId("llm-api-key-input"),
+ ).toBeInTheDocument();
+ expect(
+ within(basicForm).getByTestId("llm-api-key-help-anchor"),
+ ).toBeInTheDocument();
});
- it("should enable all input fields in basic view", async () => {
- // Arrange
- renderLlmSettingsScreen("1"); // orgId "1" returns owner role
+ it("should hide API key input when switching from non-OpenHands to OpenHands provider in SaaS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Act
+ renderLlmSettingsScreen({ appMode: "saas" });
await screen.findByTestId("llm-settings-screen");
- const basicForm = screen.getByTestId("llm-settings-form-basic");
-
- // Assert
- const providerInput = within(basicForm).getByTestId("llm-provider-input");
- const modelInput = within(basicForm).getByTestId("llm-model-input");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
await waitFor(() => {
- expect(providerInput).not.toBeDisabled();
- expect(modelInput).not.toBeDisabled();
+ expect(
+ within(basicForm).getByTestId("llm-api-key-input"),
+ ).toBeInTheDocument();
});
- // API key input may be hidden if OpenHands provider is selected in SaaS mode
- // If it exists, it should be enabled
- const apiKeyInput = within(basicForm).queryByTestId("llm-api-key-input");
- if (apiKeyInput) {
- expect(apiKeyInput).not.toBeDisabled();
- }
+ await selectProvider("OpenHands");
+
+ expect(
+ within(basicForm).queryByTestId("llm-api-key-input"),
+ ).not.toBeInTheDocument();
+ expect(
+ within(basicForm).queryByTestId("llm-api-key-help-anchor"),
+ ).not.toBeInTheDocument();
});
- it("should enable all input fields in advanced view", async () => {
- // Arrange
- renderLlmSettingsScreen("1");
+ it("should show API key input when switching from OpenHands to non-OpenHands provider in SaaS mode", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- // Act
+ renderLlmSettingsScreen({ appMode: "saas" });
await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
-
- // Assert - owners can toggle between views
- expect(advancedSwitch).not.toBeDisabled();
-
- await userEvent.click(advancedSwitch);
- const advancedForm = await screen.findByTestId(
- "llm-settings-form-advanced",
- );
- // Assert
- const modelInput = within(advancedForm).getByTestId(
- "llm-custom-model-input",
- );
- const baseUrlInput = within(advancedForm).getByTestId("base-url-input");
- const condenserSwitch = within(advancedForm).getByTestId(
- "enable-memory-condenser-switch",
- );
- const confirmationSwitch = within(advancedForm).getByTestId(
- "enable-confirmation-mode-switch",
- );
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ expect(
+ within(basicForm).queryByTestId("llm-api-key-input"),
+ ).not.toBeInTheDocument();
- await waitFor(() => {
- expect(modelInput).not.toBeDisabled();
- expect(baseUrlInput).not.toBeDisabled();
- expect(condenserSwitch).not.toBeDisabled();
- expect(confirmationSwitch).not.toBeDisabled();
- });
+ await selectProvider("OpenAI");
- // API key input may be hidden if OpenHands provider is selected in SaaS mode
- // If it exists, it should be enabled
- const apiKeyInput =
- within(advancedForm).queryByTestId("llm-api-key-input");
- if (apiKeyInput) {
- expect(apiKeyInput).not.toBeDisabled();
- }
+ expect(
+ within(basicForm).getByTestId("llm-api-key-input"),
+ ).toBeInTheDocument();
+ expect(
+ within(basicForm).getByTestId("llm-api-key-help-anchor"),
+ ).toBeInTheDocument();
});
+ });
- it("should enable submit button when form is dirty", async () => {
- // Arrange
- renderLlmSettingsScreen("1");
-
- // Act
- await screen.findByTestId("llm-settings-screen");
- const submitButton = screen.getByTestId("submit-button");
- const providerInput = screen.getByTestId("llm-provider-input");
-
- // Assert - initially disabled (no changes)
- expect(submitButton).toBeDisabled();
-
- // Act - make a change by selecting a different provider
- await userEvent.click(providerInput);
- const openAIOption = await screen.findByText("OpenAI");
- await userEvent.click(openAIOption);
+ describe("Role-based permissions", () => {
+ describe("Member role (personal overrides allowed)", () => {
+ it("should keep all input fields enabled in basic view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Assert - button should be enabled
- await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "2",
+ meData: buildOrganizationMember({ org_id: "2", role: "member" }),
+ });
+
+ await screen.findByTestId("llm-settings-screen");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput =
+ within(basicForm).getByTestId("llm-provider-input");
+ const modelInput = within(basicForm).getByTestId("llm-model-input");
+ const apiKeyInput = within(basicForm).getByTestId("llm-api-key-input");
+
+ await waitFor(() => {
+ expect(providerInput).toBeEnabled();
+ expect(modelInput).toBeEnabled();
+ expect(apiKeyInput).toBeEnabled();
+ });
});
- });
- it("should allow submitting form changes", async () => {
- // Arrange
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- renderLlmSettingsScreen("1");
+ it("should render the submit button", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings(),
+ );
- // Act
- await screen.findByTestId("llm-settings-screen");
- const providerInput = screen.getByTestId("llm-provider-input");
- const modelInput = screen.getByTestId("llm-model-input");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "2",
+ meData: buildOrganizationMember({ org_id: "2", role: "member" }),
+ });
- // Select a different provider to make form dirty
- await userEvent.click(providerInput);
- const openAIOption = await screen.findByText("OpenAI");
- await userEvent.click(openAIOption);
- await waitFor(() => {
- expect(providerInput).toHaveValue("OpenAI");
+ await screen.findByTestId("llm-settings-screen");
+ expect(screen.getByTestId("save-button")).toBeInTheDocument();
});
- // Select a different model to ensure form is dirty
- await userEvent.click(modelInput);
- const modelOption = await screen.findByText("gpt-4o");
- await userEvent.click(modelOption);
- await waitFor(() => {
- expect(modelInput).toHaveValue("gpt-4o");
- });
+ it("should keep the advanced/basic toggle enabled for members", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettingsWithAdvancedToggle(),
+ );
- // Wait for form to be marked as dirty
- const submitButton = await screen.findByTestId("submit-button");
- await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
- });
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "2",
+ meData: buildOrganizationMember({ org_id: "2", role: "member" }),
+ });
- await userEvent.click(submitButton);
+ await screen.findByTestId("llm-settings-screen");
+ const basicToggle = screen.getByTestId("sdk-section-basic-toggle");
+ const advancedToggle = screen.getByTestId(
+ "sdk-section-advanced-toggle",
+ );
- // Assert
- await waitFor(() => {
- expect(saveSettingsSpy).toHaveBeenCalled();
+ expect(basicToggle).toBeEnabled();
+ expect(advancedToggle).toBeEnabled();
+ expect(
+ screen.getByTestId("llm-settings-form-basic"),
+ ).toBeInTheDocument();
});
});
- // Note: The former "should disable security analyzer dropdown when confirmation mode
- // is enabled" test was removed. It was in the member block and only passed because
- // members have isReadOnly=true (all fields disabled), not because confirmation mode
- // disables the analyzer. For owners/admins, the security analyzer is enabled
- // regardless of confirmation mode.
- });
+ describe("Owner role (full access)", () => {
+ it("should enable all input fields in basic view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- describe("Admin role (full access)", () => {
- beforeEach(() => {
- // Mock admin role
- getMeSpy.mockResolvedValue({
- org_id: "3",
- user_id: "99",
- email: "[email protected]",
- role: "admin",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "1",
+ meData: buildOrganizationMember({ org_id: "1", role: "owner" }),
+ });
+
+ await screen.findByTestId("llm-settings-screen");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput =
+ within(basicForm).getByTestId("llm-provider-input");
+ const modelInput = within(basicForm).getByTestId("llm-model-input");
+ const apiKeyInput = within(basicForm).getByTestId("llm-api-key-input");
+
+ await waitFor(() => {
+ expect(providerInput).not.toBeDisabled();
+ expect(modelInput).not.toBeDisabled();
+ expect(apiKeyInput).not.toBeDisabled();
+ });
});
- });
- it("should enable all input fields in basic view", async () => {
- // Arrange
- renderLlmSettingsScreen("3"); // orgId "3" returns admin role
+ it("should enable all input fields in advanced view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettingsWithAdvancedToggle({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Act
- await screen.findByTestId("llm-settings-screen");
- const basicForm = screen.getByTestId("llm-settings-form-basic");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "1",
+ meData: buildOrganizationMember({ org_id: "1", role: "owner" }),
+ });
- // Assert
- const providerInput = within(basicForm).getByTestId("llm-provider-input");
- const modelInput = within(basicForm).getByTestId("llm-model-input");
+ await screen.findByTestId("llm-settings-screen");
+ await userEvent.click(
+ screen.getByTestId("sdk-section-advanced-toggle"),
+ );
- await waitFor(() => {
- expect(providerInput).not.toBeDisabled();
- expect(modelInput).not.toBeDisabled();
+ const advancedForm = screen.getByTestId("llm-settings-form-advanced");
+ const customModelInput = within(advancedForm).getByTestId(
+ "llm-custom-model-input",
+ );
+ const baseUrlInput = within(advancedForm).getByTestId("base-url-input");
+ const apiKeyInput =
+ within(advancedForm).getByTestId("llm-api-key-input");
+
+ await waitFor(() => {
+ expect(customModelInput).not.toBeDisabled();
+ expect(baseUrlInput).not.toBeDisabled();
+ expect(apiKeyInput).not.toBeDisabled();
+ });
});
- // API key input may be hidden if OpenHands provider is selected in SaaS mode
- // If it exists, it should be enabled
- const apiKeyInput = within(basicForm).queryByTestId("llm-api-key-input");
- if (apiKeyInput) {
- expect(apiKeyInput).not.toBeDisabled();
- }
- });
-
- it("should enable all input fields in advanced view", async () => {
- // Arrange
- renderLlmSettingsScreen("3");
-
- // Act
- await screen.findByTestId("llm-settings-screen");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
+ it("should enable submit button when form is dirty", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Assert - admins can toggle between views
- expect(advancedSwitch).not.toBeDisabled();
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "1",
+ meData: buildOrganizationMember({ org_id: "1", role: "owner" }),
+ });
- await userEvent.click(advancedSwitch);
- const advancedForm = await screen.findByTestId(
- "llm-settings-form-advanced",
- );
+ await screen.findByTestId("llm-settings-screen");
+ const submitButton = screen.getByTestId("save-button");
+ expect(submitButton).toBeDisabled();
- // Assert
- const modelInput = within(advancedForm).getByTestId(
- "llm-custom-model-input",
- );
- const baseUrlInput = within(advancedForm).getByTestId("base-url-input");
- const condenserSwitch = within(advancedForm).getByTestId(
- "enable-memory-condenser-switch",
- );
- const confirmationSwitch = within(advancedForm).getByTestId(
- "enable-confirmation-mode-switch",
- );
+ await userEvent.type(
+ screen.getByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
- await waitFor(() => {
- expect(modelInput).not.toBeDisabled();
- expect(baseUrlInput).not.toBeDisabled();
- expect(condenserSwitch).not.toBeDisabled();
- expect(confirmationSwitch).not.toBeDisabled();
+ await waitFor(() => {
+ expect(submitButton).not.toBeDisabled();
+ });
});
- // API key input may be hidden if OpenHands provider is selected in SaaS mode
- // If it exists, it should be enabled
- const apiKeyInput =
- within(advancedForm).queryByTestId("llm-api-key-input");
- if (apiKeyInput) {
- expect(apiKeyInput).not.toBeDisabled();
- }
- });
-
- it("should enable submit button when form is dirty", async () => {
- // Arrange
- renderLlmSettingsScreen("3");
-
- // Act
- await screen.findByTestId("llm-settings-screen");
- const submitButton = screen.getByTestId("submit-button");
- const providerInput = screen.getByTestId("llm-provider-input");
-
- // Assert - initially disabled (no changes)
- expect(submitButton).toBeDisabled();
-
- // Act - make a change by selecting a different provider
- await userEvent.click(providerInput);
- const openAIOption = await screen.findByText("OpenAI");
- await userEvent.click(openAIOption);
+ it("should allow submitting form changes", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
+
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "1",
+ meData: buildOrganizationMember({ org_id: "1", role: "owner" }),
+ });
+
+ await screen.findByTestId("llm-settings-screen");
+ await userEvent.type(
+ screen.getByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
+ await userEvent.click(screen.getByTestId("save-button"));
- // Assert - button should be enabled
- await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalled();
+ });
});
});
- it("should allow submitting form changes", async () => {
- // Arrange
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
- renderLlmSettingsScreen("3");
-
- // Act
- await screen.findByTestId("llm-settings-screen");
- const providerInput = screen.getByTestId("llm-provider-input");
- const modelInput = screen.getByTestId("llm-model-input");
+ describe("Admin role (full access)", () => {
+ it("should enable all input fields in basic view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Select a different provider to make form dirty
- await userEvent.click(providerInput);
- const openAIOption = await screen.findByText("OpenAI");
- await userEvent.click(openAIOption);
- await waitFor(() => {
- expect(providerInput).toHaveValue("OpenAI");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "3",
+ meData: buildOrganizationMember({ org_id: "3", role: "admin" }),
+ });
+
+ await screen.findByTestId("llm-settings-screen");
+ const basicForm = screen.getByTestId("llm-settings-form-basic");
+ const providerInput =
+ within(basicForm).getByTestId("llm-provider-input");
+ const modelInput = within(basicForm).getByTestId("llm-model-input");
+ const apiKeyInput = within(basicForm).getByTestId("llm-api-key-input");
+
+ await waitFor(() => {
+ expect(providerInput).not.toBeDisabled();
+ expect(modelInput).not.toBeDisabled();
+ expect(apiKeyInput).not.toBeDisabled();
+ });
});
- // Select a different model to ensure form is dirty
- await userEvent.click(modelInput);
- const modelOption = await screen.findByText("gpt-4o");
- await userEvent.click(modelOption);
- await waitFor(() => {
- expect(modelInput).toHaveValue("gpt-4o");
- });
+ it("should enable all input fields in advanced view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettingsWithAdvancedToggle({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- // Wait for form to be marked as dirty
- const submitButton = await screen.findByTestId("submit-button");
- await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
- });
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "3",
+ meData: buildOrganizationMember({ org_id: "3", role: "admin" }),
+ });
- await userEvent.click(submitButton);
+ await screen.findByTestId("llm-settings-screen");
+ await userEvent.click(
+ screen.getByTestId("sdk-section-advanced-toggle"),
+ );
- // Assert
- await waitFor(() => {
- expect(saveSettingsSpy).toHaveBeenCalled();
+ const advancedForm = screen.getByTestId("llm-settings-form-advanced");
+ const customModelInput = within(advancedForm).getByTestId(
+ "llm-custom-model-input",
+ );
+ const baseUrlInput = within(advancedForm).getByTestId("base-url-input");
+ const apiKeyInput =
+ within(advancedForm).getByTestId("llm-api-key-input");
+
+ await waitFor(() => {
+ expect(customModelInput).not.toBeDisabled();
+ expect(baseUrlInput).not.toBeDisabled();
+ expect(apiKeyInput).not.toBeDisabled();
+ });
});
- });
- });
-});
-
-describe("Contextual info messages", () => {
- it("should show admin info message for admin user in team organization", async () => {
- // Arrange: SaaS mode with team org and admin role
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
- mockUseOrgTypeAndAccess.mockReturnValue({
- selectedOrg: createMockOrganization({ id: "1", name: "Test Org", is_personal: false }),
- isPersonalOrg: false,
- isTeamOrg: true,
- canViewOrgRoutes: true,
- organizationId: "1",
- });
- const adminData = {
- org_id: "1",
- user_id: "99",
- email: "[email protected]",
- role: "admin",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
- };
-
- // Act
- renderLlmSettingsScreen("1", adminData);
- await screen.findByTestId("llm-settings-screen");
- // Assert
- const infoMessage = screen.getByTestId("llm-settings-info-message");
- expect(infoMessage).toHaveTextContent("SETTINGS$LLM_ADMIN_INFO");
- });
+ it("should enable submit button when form is dirty", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
- it("should show member info message for member user in team organization", async () => {
- // Arrange: SaaS mode with team org and member role
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
- mockUseOrgTypeAndAccess.mockReturnValue({
- selectedOrg: createMockOrganization({ id: "1", name: "Test Org", is_personal: false }),
- isPersonalOrg: false,
- isTeamOrg: true,
- canViewOrgRoutes: true,
- organizationId: "1",
- });
- const memberData = {
- org_id: "1",
- user_id: "99",
- email: "[email protected]",
- role: "member",
- status: "active",
- llm_api_key: "",
- max_iterations: 20,
- llm_model: "",
- llm_api_key_for_byor: null,
- llm_base_url: "",
- };
-
- // Act
- renderLlmSettingsScreen("1", memberData);
- await screen.findByTestId("llm-settings-screen");
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "3",
+ meData: buildOrganizationMember({ org_id: "3", role: "admin" }),
+ });
- // Assert
- const infoMessage = screen.getByTestId("llm-settings-info-message");
- expect(infoMessage).toHaveTextContent("SETTINGS$LLM_MEMBER_INFO");
- });
+ await screen.findByTestId("llm-settings-screen");
+ const submitButton = screen.getByTestId("save-button");
+ expect(submitButton).toBeDisabled();
- it("should not show info message for personal workspace", async () => {
- // Arrange: SaaS mode with personal org
- mockUseConfig.mockReturnValue({
- data: { app_mode: "saas" },
- isLoading: false,
- });
- mockUseOrgTypeAndAccess.mockReturnValue({
- selectedOrg: createMockOrganization({ id: "1", name: "Personal Org", is_personal: true }),
- isPersonalOrg: true,
- isTeamOrg: false,
- canViewOrgRoutes: false,
- organizationId: "1",
- });
+ await userEvent.type(
+ screen.getByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
- // Act
- renderLlmSettingsScreen("1");
- await screen.findByTestId("llm-settings-screen");
+ await waitFor(() => {
+ expect(submitButton).not.toBeDisabled();
+ });
+ });
- // Assert
- expect(screen.queryByTestId("llm-settings-info-message")).not.toBeInTheDocument();
- });
+ it("should allow submitting form changes", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
+ buildSettings({
+ llm_model: "openai/gpt-4o",
+ agent_settings: { llm: { model: "openai/gpt-4o" } },
+ }),
+ );
+ const saveSettingsSpy = vi
+ .spyOn(SettingsService, "saveSettings")
+ .mockResolvedValue(true);
+
+ renderLlmSettingsScreen({
+ appMode: "saas",
+ organizationId: "3",
+ meData: buildOrganizationMember({ org_id: "3", role: "admin" }),
+ });
+
+ await screen.findByTestId("llm-settings-screen");
+ await userEvent.type(
+ screen.getByTestId("llm-api-key-input"),
+ "test-api-key",
+ );
+ await userEvent.click(screen.getByTestId("save-button"));
- it("should not show info message in OSS mode", async () => {
- // Arrange: OSS mode
- mockUseConfig.mockReturnValue({
- data: { app_mode: "oss" },
- isLoading: false,
- });
- mockUseOrgTypeAndAccess.mockReturnValue({
- selectedOrg: createMockOrganization({ id: "1", name: "Test Org", is_personal: false }),
- isPersonalOrg: false,
- isTeamOrg: true,
- canViewOrgRoutes: true,
- organizationId: "1",
+ await waitFor(() => {
+ expect(saveSettingsSpy).toHaveBeenCalled();
+ });
+ });
});
- // Act
- renderLlmSettingsScreen("1");
- await screen.findByTestId("llm-settings-screen");
-
- // Assert
- expect(screen.queryByTestId("llm-settings-info-message")).not.toBeInTheDocument();
- });
-});
-
-describe("clientLoader permission checks", () => {
- it("should export a clientLoader for route protection", async () => {
- // This test verifies the clientLoader is exported for consistency with other routes
- // Note: All roles have view_llm_settings permission, so this guard ensures
- // the route is protected and can be restricted in the future if needed
- const { clientLoader } = await import("#/routes/llm-settings");
- expect(clientLoader).toBeDefined();
- expect(typeof clientLoader).toBe("function");
+ describe("clientLoader permission checks", () => {
+ it("should export a clientLoader for route protection", () => {
+ expect(clientLoader).toBeTypeOf("function");
+ });
+ });
});
});
diff --git a/frontend/__tests__/routes/manage-org.test.tsx b/frontend/__tests__/routes/manage-org.test.tsx
index 8f5cc137be..a72d963a3e 100644
--- a/frontend/__tests__/routes/manage-org.test.tsx
+++ b/frontend/__tests__/routes/manage-org.test.tsx
@@ -111,7 +111,6 @@ describe("Manage Org Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -123,7 +122,6 @@ describe("Manage Org Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -138,7 +136,6 @@ describe("Manage Org Route", () => {
llm_api_key: string;
max_iterations: number;
llm_model: string;
- llm_api_key_for_byor: string | null;
llm_base_url: string;
status: "active" | "invited" | "inactive";
}) => {
@@ -456,7 +453,6 @@ describe("Manage Org Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -482,7 +478,6 @@ describe("Manage Org Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
diff --git a/frontend/__tests__/routes/manage-organization-members.test.tsx b/frontend/__tests__/routes/manage-organization-members.test.tsx
index 391fef1b44..b37616eefc 100644
--- a/frontend/__tests__/routes/manage-organization-members.test.tsx
+++ b/frontend/__tests__/routes/manage-organization-members.test.tsx
@@ -133,7 +133,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -225,7 +224,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: string;
max_iterations: number;
llm_model: string;
- llm_api_key_for_byor: string | null;
llm_base_url: string;
status: "active" | "invited" | "inactive";
},
@@ -253,7 +251,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: string;
max_iterations: number;
llm_model: string;
- llm_api_key_for_byor: string | null;
llm_base_url: string;
status: "active" | "invited" | "inactive";
},
@@ -376,7 +373,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -435,7 +431,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
};
@@ -480,7 +475,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
@@ -492,7 +486,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
@@ -514,7 +507,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -551,7 +543,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -661,7 +652,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "invited",
},
@@ -708,7 +698,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -731,7 +720,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
};
@@ -776,7 +764,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
};
@@ -821,7 +808,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
@@ -833,7 +819,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
@@ -855,7 +840,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -891,7 +875,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -928,7 +911,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -964,7 +946,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
},
@@ -1006,7 +987,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
@@ -1036,7 +1016,6 @@ describe("Manage Organization Members Route", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active" as const,
},
diff --git a/frontend/__tests__/routes/mcp-settings.test.tsx b/frontend/__tests__/routes/mcp-settings.test.tsx
index 955c290e67..ddaf6adea7 100644
--- a/frontend/__tests__/routes/mcp-settings.test.tsx
+++ b/frontend/__tests__/routes/mcp-settings.test.tsx
@@ -1,9 +1,123 @@
-import { describe, expect, it } from "vitest";
-import { clientLoader } from "#/routes/mcp-settings";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import SettingsService from "#/api/settings-service/settings-service.api";
+import {
+ MOCK_DEFAULT_USER_SETTINGS,
+ resetTestHandlersMockSettings,
+} from "#/mocks/handlers";
+import MCPSettingsScreen, { clientLoader } from "#/routes/mcp-settings";
+import { useSelectedOrganizationStore } from "#/stores/selected-organization-store";
+import { Settings } from "#/types/settings";
+
+function buildSettings(overrides: Partial<Settings> = {}): Settings {
+ return {
+ ...MOCK_DEFAULT_USER_SETTINGS,
+ ...overrides,
+ agent_settings: {
+ ...MOCK_DEFAULT_USER_SETTINGS.agent_settings,
+ ...overrides.agent_settings,
+ },
+ };
+}
+
+function deepMerge(
+ base: Record<string, unknown>,
+ patch: Record<string, unknown>,
+): Record<string, unknown> {
+ const result = { ...base };
+
+ for (const [key, value] of Object.entries(patch)) {
+ if (
+ value != null &&
+ typeof value === "object" &&
+ !Array.isArray(value) &&
+ result[key] != null &&
+ typeof result[key] === "object" &&
+ !Array.isArray(result[key])
+ ) {
+ result[key] = deepMerge(
+ result[key] as Record<string, unknown>,
+ value as Record<string, unknown>,
+ );
+ } else {
+ result[key] = value;
+ }
+ }
+
+ return result;
+}
+
+function renderMcpSettingsScreen() {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+ });
+
+ useSelectedOrganizationStore.setState({ organizationId: "1" });
+
+ return render(<MCPSettingsScreen />, {
+ wrapper: ({ children }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ ),
+ });
+}
+
+beforeEach(() => {
+ vi.restoreAllMocks();
+ resetTestHandlersMockSettings();
+ useSelectedOrganizationStore.setState({ organizationId: "1" });
+});
+
+describe("MCPSettingsScreen", () => {
+ it("removes a newly added MCP server after the delete flow completes", async () => {
+ let persistedSettings = buildSettings();
+
+ vi.spyOn(SettingsService, "getSettings").mockImplementation(async () =>
+ structuredClone(persistedSettings),
+ );
+ vi.spyOn(SettingsService, "saveSettings").mockImplementation(
+ async (payload) => {
+ persistedSettings = buildSettings(
+ deepMerge(
+ structuredClone(persistedSettings) as Record<string, unknown>,
+ payload as Record<string, unknown>,
+ ) as Partial<Settings>,
+ );
+ return true;
+ },
+ );
+
+ renderMcpSettingsScreen();
+
+ await screen.findByText("SETTINGS$MCP_NO_SERVERS");
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "SETTINGS$MCP_ADD_SERVER" }),
+ );
+ await userEvent.type(
+ await screen.findByTestId("url-input"),
+ "https://mcp.example.com/sse",
+ );
+ await userEvent.click(screen.getByTestId("submit-button"));
+
+ await waitFor(() => {
+ expect(screen.getAllByTestId("mcp-server-item")).toHaveLength(1);
+ });
+
+ await userEvent.click(screen.getByTestId("delete-mcp-server-button"));
+ await userEvent.click(await screen.findByTestId("confirm-button"));
+
+ await waitFor(() => {
+ expect(screen.queryAllByTestId("mcp-server-item")).toHaveLength(0);
+ });
+ });
+});
describe("clientLoader permission checks", () => {
it("should export a clientLoader for route protection", () => {
- // This test verifies the clientLoader is exported (for consistency with other routes)
expect(clientLoader).toBeDefined();
expect(typeof clientLoader).toBe("function");
});
diff --git a/frontend/__tests__/routes/secrets-settings.test.tsx b/frontend/__tests__/routes/secrets-settings.test.tsx
index f67d15f42e..cec49b0626 100644
--- a/frontend/__tests__/routes/secrets-settings.test.tsx
+++ b/frontend/__tests__/routes/secrets-settings.test.tsx
@@ -80,7 +80,6 @@ describe("clientLoader permission checks", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
...overrides,
diff --git a/frontend/__tests__/routes/settings.test.tsx b/frontend/__tests__/routes/settings.test.tsx
index bdc2c0c822..24c286270c 100644
--- a/frontend/__tests__/routes/settings.test.tsx
+++ b/frontend/__tests__/routes/settings.test.tsx
@@ -70,7 +70,6 @@ describe("Settings Screen", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
...overrides,
@@ -152,10 +151,10 @@ describe("Settings Screen", () => {
const navbar = await screen.findByTestId("settings-navbar");
sectionsToInclude.forEach((section) => {
- const sectionElement = within(navbar).getByText(section, {
+ const sectionElements = within(navbar).getAllByText(section, {
exact: false, // case insensitive
});
- expect(sectionElement).toBeInTheDocument();
+ expect(sectionElements.length).toBeGreaterThan(0);
});
sectionsToExclude.forEach((section) => {
const sectionElement = within(navbar).queryByText(section, {
@@ -202,10 +201,10 @@ describe("Settings Screen", () => {
expect(within(navbar).getByText("Billing")).toBeInTheDocument();
});
sectionsToInclude.forEach((section) => {
- const sectionElement = within(navbar).getByText(section, {
+ const sectionElements = within(navbar).getAllByText(section, {
exact: false, // case insensitive
});
- expect(sectionElement).toBeInTheDocument();
+ expect(sectionElements.length).toBeGreaterThan(0);
});
sectionsToExclude.forEach((section) => {
const sectionElement = within(navbar).queryByText(section, {
@@ -266,7 +265,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -307,7 +305,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -346,7 +343,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -410,7 +406,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -466,7 +461,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
@@ -602,7 +596,6 @@ describe("Settings Screen", () => {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
status: "active",
});
diff --git a/frontend/__tests__/routes/verification-settings.test.tsx b/frontend/__tests__/routes/verification-settings.test.tsx
new file mode 100644
index 0000000000..f39a569c85
--- /dev/null
+++ b/frontend/__tests__/routes/verification-settings.test.tsx
@@ -0,0 +1,60 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import SettingsService from "#/api/settings-service/settings-service.api";
+import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
+import VerificationSettingsScreen, {
+ clientLoader,
+} from "#/routes/verification-settings";
+import { Settings } from "#/types/settings";
+
+function buildSettings(overrides: Partial<Settings> = {}): Settings {
+ return {
+ ...MOCK_DEFAULT_USER_SETTINGS,
+ ...overrides,
+ conversation_settings: {
+ ...MOCK_DEFAULT_USER_SETTINGS.conversation_settings,
+ ...overrides.conversation_settings,
+ },
+ conversation_settings_schema:
+ overrides.conversation_settings_schema ??
+ MOCK_DEFAULT_USER_SETTINGS.conversation_settings_schema,
+ };
+}
+
+function renderVerificationSettingsScreen() {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+ });
+
+ return render(<VerificationSettingsScreen />, {
+ wrapper: ({ children }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ ),
+ });
+}
+
+beforeEach(() => {
+ vi.restoreAllMocks();
+});
+
+describe("VerificationSettingsScreen", () => {
+ it("keeps the confirmation controls visible in the basic view", async () => {
+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
+
+ renderVerificationSettingsScreen();
+
+ await screen.findByTestId("verification-settings-screen");
+
+ expect(screen.getByTestId("confirmation-mode-toggle")).toBeInTheDocument();
+ });
+});
+
+describe("clientLoader permission checks", () => {
+ it("should export a clientLoader for route protection", () => {
+ expect(clientLoader).toBeDefined();
+ expect(typeof clientLoader).toBe("function");
+ });
+});
diff --git a/frontend/__tests__/settings-schema-descriptions.test.ts b/frontend/__tests__/settings-schema-descriptions.test.ts
new file mode 100644
index 0000000000..bcbafbcfae
--- /dev/null
+++ b/frontend/__tests__/settings-schema-descriptions.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it } from "vitest";
+import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
+
+describe("settings schema descriptions", () => {
+ it("provides helper descriptions for every schema-driven settings field", () => {
+ const schemas = [
+ MOCK_DEFAULT_USER_SETTINGS.agent_settings_schema,
+ MOCK_DEFAULT_USER_SETTINGS.conversation_settings_schema,
+ ].filter((schema): schema is NonNullable<typeof schema> => Boolean(schema));
+
+ const missingDescriptions = schemas.flatMap((schema) =>
+ schema.sections.flatMap((section) =>
+ section.fields
+ .filter((field) => !field.description?.trim())
+ .map((field) => field.key),
+ ),
+ );
+
+ expect(missingDescriptions).toEqual([]);
+ });
+});
diff --git a/frontend/__tests__/utils/has-advanced-settings-set.test.ts b/frontend/__tests__/utils/has-advanced-settings-set.test.ts
index be928262d1..65884d45f8 100644
--- a/frontend/__tests__/utils/has-advanced-settings-set.test.ts
+++ b/frontend/__tests__/utils/has-advanced-settings-set.test.ts
@@ -12,11 +12,16 @@ describe("hasAdvancedSettingsSet", () => {
});
describe("should be true if", () => {
- test("llm_base_url is set", () => {
+ test("llm.base_url is set", () => {
+ const as = DEFAULT_SETTINGS.agent_settings as Record<string, unknown>;
+ const llm = (as?.llm ?? {}) as Record<string, unknown>;
expect(
hasAdvancedSettingsSet({
...DEFAULT_SETTINGS,
- llm_base_url: "test",
+ agent_settings: {
+ ...as,
+ llm: { ...llm, base_url: "test" },
+ },
}),
).toBe(true);
});
@@ -25,50 +30,59 @@ describe("hasAdvancedSettingsSet", () => {
expect(
hasAdvancedSettingsSet({
...DEFAULT_SETTINGS,
- agent: "test",
+ agent_settings: {
+ ...DEFAULT_SETTINGS.agent_settings,
+ agent: "test",
+ },
}),
).toBe(true);
});
- test("enable_default_condenser is disabled", () => {
- // Arrange
+ test("condenser.enabled is disabled", () => {
+ const as = DEFAULT_SETTINGS.agent_settings as Record<string, unknown>;
+ const condenser = (as?.condenser ?? {}) as Record<string, unknown>;
const settings = {
...DEFAULT_SETTINGS,
- enable_default_condenser: false,
+ agent_settings: {
+ ...as,
+ condenser: { ...condenser, enabled: false },
+ },
};
- // Act
const result = hasAdvancedSettingsSet(settings);
- // Assert
expect(result).toBe(true);
});
- test("condenser_max_size is customized above default", () => {
- // Arrange
+ test("condenser.max_size is customized above default", () => {
+ const as = DEFAULT_SETTINGS.agent_settings as Record<string, unknown>;
+ const condenser = (as?.condenser ?? {}) as Record<string, unknown>;
const settings = {
...DEFAULT_SETTINGS,
- condenser_max_size: 200,
+ agent_settings: {
+ ...as,
+ condenser: { ...condenser, max_size: 200 },
+ },
};
- // Act
const result = hasAdvancedSettingsSet(settings);
- // Assert
expect(result).toBe(true);
});
- test("condenser_max_size is customized below default", () => {
- // Arrange
+ test("condenser.max_size is customized below default", () => {
+ const as = DEFAULT_SETTINGS.agent_settings as Record<string, unknown>;
+ const condenser = (as?.condenser ?? {}) as Record<string, unknown>;
const settings = {
...DEFAULT_SETTINGS,
- condenser_max_size: 50,
+ agent_settings: {
+ ...as,
+ condenser: { ...condenser, max_size: 50 },
+ },
};
- // Act
const result = hasAdvancedSettingsSet(settings);
- // Assert
expect(result).toBe(true);
});
diff --git a/frontend/__tests__/utils/model-name-case-preservation.test.tsx b/frontend/__tests__/utils/model-name-case-preservation.test.tsx
index f3853ce4a5..560c0c5afa 100644
--- a/frontend/__tests__/utils/model-name-case-preservation.test.tsx
+++ b/frontend/__tests__/utils/model-name-case-preservation.test.tsx
@@ -1,9 +1,14 @@
import { describe, it, expect } from "vitest";
import { extractSettings } from "#/utils/settings-utils";
+function getLlmModel(settings: ReturnType<typeof extractSettings>): unknown {
+ const as = settings.agent_settings as Record<string, unknown> | undefined;
+ const llm = as?.llm as Record<string, unknown> | undefined;
+ return llm?.model;
+}
+
describe("Model name case preservation", () => {
it("should preserve the original case of model names in extractSettings", () => {
- // Create FormData with proper casing
const formData = new FormData();
formData.set("llm-provider-input", "SambaNova");
formData.set("llm-model-input", "Meta-Llama-3.1-8B-Instruct");
@@ -12,8 +17,9 @@ describe("Model name case preservation", () => {
const settings = extractSettings(formData);
- // Test that model names maintain their original casing
- expect(settings.llm_model).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
+ expect(getLlmModel(settings)).toBe(
+ "SambaNova/Meta-Llama-3.1-8B-Instruct",
+ );
});
it("should preserve openai model case", () => {
@@ -24,7 +30,7 @@ describe("Model name case preservation", () => {
formData.set("language", "en");
const settings = extractSettings(formData);
- expect(settings.llm_model).toBe("openai/gpt-4o");
+ expect(getLlmModel(settings)).toBe("openai/gpt-4o");
});
it("should preserve anthropic model case", () => {
@@ -35,7 +41,7 @@ describe("Model name case preservation", () => {
formData.set("language", "en");
const settings = extractSettings(formData);
- expect(settings.llm_model).toBe("anthropic/claude-sonnet-4-20250514");
+ expect(getLlmModel(settings)).toBe("anthropic/claude-sonnet-4-20250514");
});
it("should not automatically lowercase model names", () => {
@@ -47,8 +53,11 @@ describe("Model name case preservation", () => {
const settings = extractSettings(formData);
- // Test that camelCase and PascalCase are preserved
- expect(settings.llm_model).not.toBe("sambanova/meta-llama-3.1-8b-instruct");
- expect(settings.llm_model).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
+ expect(getLlmModel(settings)).not.toBe(
+ "sambanova/meta-llama-3.1-8b-instruct",
+ );
+ expect(getLlmModel(settings)).toBe(
+ "SambaNova/Meta-Llama-3.1-8B-Instruct",
+ );
});
});
diff --git a/frontend/__tests__/utils/permission-checks.test.ts b/frontend/__tests__/utils/permission-checks.test.ts
index db5a09951e..e9b969da49 100644
--- a/frontend/__tests__/utils/permission-checks.test.ts
+++ b/frontend/__tests__/utils/permission-checks.test.ts
@@ -37,7 +37,6 @@ const mockUser: OrganizationMember = {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
};
diff --git a/frontend/__tests__/utils/permission-guard.test.ts b/frontend/__tests__/utils/permission-guard.test.ts
index 7d9b43afc0..3409437188 100644
--- a/frontend/__tests__/utils/permission-guard.test.ts
+++ b/frontend/__tests__/utils/permission-guard.test.ts
@@ -71,7 +71,6 @@ describe("createPermissionGuard", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
});
@@ -94,7 +93,6 @@ describe("createPermissionGuard", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
});
@@ -145,7 +143,6 @@ describe("createPermissionGuard", () => {
llm_api_key: "",
max_iterations: 100,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "",
status: "active",
});
diff --git a/frontend/__tests__/utils/sdk-settings-schema.test.ts b/frontend/__tests__/utils/sdk-settings-schema.test.ts
new file mode 100644
index 0000000000..7e49677c48
--- /dev/null
+++ b/frontend/__tests__/utils/sdk-settings-schema.test.ts
@@ -0,0 +1,337 @@
+import { describe, expect, it } from "vitest";
+
+import {
+ buildInitialSettingsFormValues,
+ buildSdkSettingsPayload,
+ buildSdkSettingsPayloadForView,
+ getVisibleSettingsSections,
+ hasAdvancedSettingsOverrides,
+ inferInitialView,
+ SPECIALLY_RENDERED_KEYS,
+} from "#/utils/sdk-settings-schema";
+import { DEFAULT_SETTINGS } from "#/services/settings";
+import { Settings } from "#/types/settings";
+
+const BASE_SETTINGS: Settings = {
+ ...DEFAULT_SETTINGS,
+ agent_settings_schema: {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.model",
+ label: "Model",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: "claude-sonnet-4-20250514",
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.api_key",
+ label: "API Key",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: true,
+ required: false,
+ },
+ {
+ key: "llm.base_url",
+ label: "Base URL",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: false,
+ },
+ {
+ key: "llm.litellm_extra_body",
+ label: "LiteLLM Extra Body",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "object",
+ default: {},
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ {
+ key: "critic",
+ label: "Critic",
+ fields: [
+ {
+ key: "critic.enabled",
+ label: "Enable critic",
+ section: "critic",
+ section_label: "Critic",
+ value_type: "boolean",
+ default: false,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "critic.mode",
+ label: "Mode",
+ section: "critic",
+ section_label: "Critic",
+ value_type: "string",
+ default: "finish_and_message",
+ choices: [
+ { label: "finish_and_message", value: "finish_and_message" },
+ { label: "all_actions", value: "all_actions" },
+ ],
+ depends_on: ["critic.enabled"],
+ prominence: "minor",
+ secret: false,
+ required: true,
+ },
+ ],
+ },
+ {
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "mcp_config",
+ label: "MCP configuration",
+ section: "general",
+ section_label: "General",
+ value_type: "object",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "minor",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+ },
+ agent_settings: {
+ agent: "CodeActAgent",
+ critic: {
+ mode: "finish_and_message",
+ enabled: false,
+ },
+ llm: {
+ api_key: null,
+ model: "openai/gpt-4o",
+ },
+ verification: {
+ confirmation_mode: false,
+ },
+ condenser: {
+ enabled: true,
+ max_size: 240,
+ },
+ },
+};
+
+describe("sdk settings schema helpers", () => {
+ it("builds initial form values from the current settings", () => {
+ expect(buildInitialSettingsFormValues(BASE_SETTINGS)).toEqual({
+ "critic.mode": "finish_and_message",
+ "critic.enabled": false,
+ "llm.api_key": "",
+ "llm.base_url": "",
+ "llm.litellm_extra_body": "{}",
+ "llm.model": "openai/gpt-4o",
+ mcp_config: "",
+ });
+ });
+
+ it("detects advanced overrides from non-default values", () => {
+ expect(hasAdvancedSettingsOverrides(BASE_SETTINGS)).toBe(false);
+ expect(inferInitialView(BASE_SETTINGS)).toBe("basic");
+
+ const withMinorOverride: Settings = {
+ ...BASE_SETTINGS,
+ agent_settings: {
+ ...BASE_SETTINGS.agent_settings,
+ critic: {
+ ...(BASE_SETTINGS.agent_settings as Record<string, unknown>)
+ .critic as Record<string, unknown>,
+ mode: "all_actions",
+ },
+ },
+ };
+ expect(hasAdvancedSettingsOverrides(withMinorOverride)).toBe(true);
+ expect(inferInitialView(withMinorOverride)).toBe("all");
+ });
+
+ it("treats empty object value as equivalent to null default (mcp_config serializer artifact)", () => {
+ // The backend serialises mcp_config=None as {} via a custom Pydantic
+ // serializer, but the schema default is null. The view should stay
+ // "basic" because an empty object is semantically the same as null.
+ const withEmptyMcpConfig: Settings = {
+ ...BASE_SETTINGS,
+ agent_settings: {
+ ...BASE_SETTINGS.agent_settings,
+ mcp_config: {},
+ },
+ };
+ expect(inferInitialView(withEmptyMcpConfig)).toBe("basic");
+ });
+
+ it("filters fields by view tier and excludes specially-rendered keys", () => {
+ const values = buildInitialSettingsFormValues(BASE_SETTINGS);
+
+ const basicSections = getVisibleSettingsSections(
+ BASE_SETTINGS.agent_settings_schema!,
+ values,
+ "basic",
+ );
+ const allBasicFields = basicSections.flatMap((s) => s.fields);
+ for (const field of allBasicFields) {
+ expect(SPECIALLY_RENDERED_KEYS.has(field.key)).toBe(false);
+ expect(field.prominence).toBe("critical");
+ }
+
+ const allSections = getVisibleSettingsSections(
+ BASE_SETTINGS.agent_settings_schema!,
+ { ...values, "critic.enabled": true },
+ "all",
+ );
+ const criticSection = allSections.find((s) => s.key === "critic");
+ expect(criticSection?.fields).toHaveLength(2);
+ });
+
+ it("passes through all fields when excludeKeys is empty", () => {
+ const values = buildInitialSettingsFormValues(BASE_SETTINGS);
+ const sections = getVisibleSettingsSections(
+ BASE_SETTINGS.agent_settings_schema!,
+ values,
+ "basic",
+ new Set(),
+ );
+ const allFieldKeys = sections.flatMap((s) => s.fields.map((f) => f.key));
+ expect(allFieldKeys).toContain("llm.model");
+ expect(allFieldKeys).toContain("llm.api_key");
+ });
+
+ it("builds a typed payload from dirty schema values", () => {
+ const payload = buildSdkSettingsPayload(
+ BASE_SETTINGS.agent_settings_schema!,
+ {
+ ...buildInitialSettingsFormValues(BASE_SETTINGS),
+ "critic.enabled": true,
+ "llm.api_key": "new-key",
+ "llm.litellm_extra_body": JSON.stringify(
+ { metadata: { tier: "enterprise" } },
+ null,
+ 2,
+ ),
+ },
+ {
+ "critic.enabled": true,
+ "llm.api_key": true,
+ "llm.litellm_extra_body": true,
+ "llm.model": false,
+ },
+ );
+
+ expect(payload).toEqual({
+ critic: { enabled: true },
+ llm: {
+ api_key: "new-key",
+ litellm_extra_body: { metadata: { tier: "enterprise" } },
+ },
+ });
+ });
+
+ it("resets fields outside the selected view back to schema defaults", () => {
+ const schema = structuredClone(BASE_SETTINGS.agent_settings_schema!);
+ schema.sections[0].fields.push({
+ key: "llm.timeout",
+ label: "Timeout",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "integer",
+ default: 30,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: false,
+ });
+
+ const values = {
+ ...buildInitialSettingsFormValues({
+ ...BASE_SETTINGS,
+ agent_settings_schema: schema,
+ }),
+ "llm.model": "anthropic/claude-sonnet-4-20250514",
+ "llm.timeout": "90",
+ "critic.enabled": true,
+ "critic.mode": "all_actions",
+ "llm.litellm_extra_body": JSON.stringify(
+ { metadata: { tier: "enterprise" } },
+ null,
+ 2,
+ ),
+ };
+
+ const dirty = {
+ "llm.model": true,
+ "llm.timeout": true,
+ "critic.enabled": true,
+ "critic.mode": true,
+ "llm.litellm_extra_body": true,
+ };
+
+ expect(buildSdkSettingsPayloadForView(schema, values, dirty, "basic")).toEqual({
+ llm: {
+ model: "anthropic/claude-sonnet-4-20250514",
+ timeout: 30,
+ litellm_extra_body: {},
+ },
+ critic: { enabled: true, mode: "finish_and_message" },
+ mcp_config: null,
+ });
+
+ expect(
+ buildSdkSettingsPayloadForView(schema, values, dirty, "advanced"),
+ ).toEqual({
+ llm: {
+ model: "anthropic/claude-sonnet-4-20250514",
+ timeout: 90,
+ litellm_extra_body: {},
+ },
+ critic: { enabled: true, mode: "finish_and_message" },
+ mcp_config: null,
+ });
+
+ expect(buildSdkSettingsPayloadForView(schema, values, dirty, "all")).toEqual({
+ llm: {
+ model: "anthropic/claude-sonnet-4-20250514",
+ timeout: 90,
+ litellm_extra_body: { metadata: { tier: "enterprise" } },
+ },
+ critic: { enabled: true, mode: "all_actions" },
+ });
+ });
+});
diff --git a/frontend/__tests__/utils/settings-utils.test.ts b/frontend/__tests__/utils/settings-utils.test.ts
index 9eb9a038a5..abe7affc8c 100644
--- a/frontend/__tests__/utils/settings-utils.test.ts
+++ b/frontend/__tests__/utils/settings-utils.test.ts
@@ -50,7 +50,6 @@ describe("parseMaxBudgetPerTask", () => {
describe("extractSettings", () => {
it("should preserve model name case when extracting settings", () => {
- // Test cases with various model name formats
const testCases = [
{ provider: "sambanova", model: "Meta-Llama-3.1-8B-Instruct" },
{ provider: "openai", model: "GPT-4o" },
@@ -65,17 +64,17 @@ describe("extractSettings", () => {
const settings = extractSettings(formData);
- // Verify that the model name case is preserved
const expectedModel = `${provider}/${model}`;
- expect(settings.llm_model).toBe(expectedModel);
- // Only test that it's not lowercased if the original has uppercase letters
+ const as = settings.agent_settings as Record<string, unknown>;
+ const llm = as?.llm as Record<string, unknown>;
+ expect(llm?.model).toBe(expectedModel);
if (expectedModel !== expectedModel.toLowerCase()) {
- expect(settings.llm_model).not.toBe(expectedModel.toLowerCase());
+ expect(llm?.model).not.toBe(expectedModel.toLowerCase());
}
});
});
- it("should handle custom model without lowercasing", () => {
+ it("should preserve selected model case and ignore unsupported custom-model inputs", () => {
const formData = new FormData();
formData.set("llm-provider-input", "sambanova");
formData.set("llm-model-input", "Meta-Llama-3.1-8B-Instruct");
@@ -84,8 +83,9 @@ describe("extractSettings", () => {
const settings = extractSettings(formData);
- // Custom model should take precedence and preserve case
- expect(settings.llm_model).toBe("Custom-Model-Name");
- expect(settings.llm_model).not.toBe("custom-model-name");
+ const as = settings.agent_settings as Record<string, unknown>;
+ const llm = as?.llm as Record<string, unknown>;
+ expect(llm?.model).toBe("sambanova/Meta-Llama-3.1-8B-Instruct");
+ expect(llm?.model).not.toBe("custom-model-name");
});
});
diff --git a/frontend/src/api/organization-service/organization-service.api.ts b/frontend/src/api/organization-service/organization-service.api.ts
index 9684deb1e6..a5e08908a1 100644
--- a/frontend/src/api/organization-service/organization-service.api.ts
+++ b/frontend/src/api/organization-service/organization-service.api.ts
@@ -5,8 +5,17 @@ import {
OrganizationMembersPage,
UpdateOrganizationMemberParams,
} from "#/types/org";
+import { Settings } from "#/types/settings";
import { openHands } from "../open-hands-axios";
+type OrganizationAgentSettingsResponse = Pick<
+ Settings,
+ | "agent_settings"
+ | "conversation_settings"
+ | "search_api_key"
+ | "llm_api_key_set"
+>;
+
export const organizationService = {
getMe: async ({ orgId }: { orgId: string }) => {
const { data } = await openHands.get<OrganizationMember>(
@@ -169,6 +178,23 @@ export const organizationService = {
return data;
},
+ getOrganizationAgentSettings: async () => {
+ const { data } = await openHands.get<OrganizationAgentSettingsResponse>(
+ "/api/organizations/llm",
+ );
+ return data;
+ },
+
+ saveOrganizationAgentSettings: async (
+ settings: Partial<Settings> & Record<string, unknown>,
+ ) => {
+ const { data } = await openHands.post<OrganizationAgentSettingsResponse>(
+ "/api/organizations/llm",
+ settings,
+ );
+ return data;
+ },
+
getGitClaims: async ({ orgId }: { orgId: string }) => {
const { data } = await openHands.get<GitOrgClaim[]>(
`/api/organizations/${orgId}/git-claims`,
diff --git a/frontend/src/api/settings-service/settings-service.api.ts b/frontend/src/api/settings-service/settings-service.api.ts
index 1f3d2fc370..c966cf182f 100644
--- a/frontend/src/api/settings-service/settings-service.api.ts
+++ b/frontend/src/api/settings-service/settings-service.api.ts
@@ -1,5 +1,5 @@
import { openHands } from "../open-hands-axios";
-import { Settings } from "#/types/settings";
+import { Settings, SettingsSchema } from "#/types/settings";
/**
* Settings service for managing application settings
@@ -13,11 +13,30 @@ class SettingsService {
return data;
}
+ /**
+ * Get the AgentSettings schema used to render schema-driven settings pages.
+ */
+ static async getSettingsSchema(): Promise<SettingsSchema> {
+ const { data } = await openHands.get<SettingsSchema>(
+ "/api/v1/settings/agent-schema",
+ );
+ return data;
+ }
+
+ static async getConversationSettingsSchema(): Promise<SettingsSchema> {
+ const { data } = await openHands.get<SettingsSchema>(
+ "/api/v1/settings/conversation-schema",
+ );
+ return data;
+ }
+
/**
* Save the settings to the server. Only valid settings are saved.
* @param settings - the settings to save
*/
- static async saveSettings(settings: Partial<Settings>): Promise<boolean> {
+ static async saveSettings(
+ settings: Partial<Settings> & Record<string, unknown>,
+ ): Promise<boolean> {
const data = await openHands.post("/api/v1/settings", settings);
return data.status === 200;
}
diff --git a/frontend/src/components/features/settings/org-defaults-banner.tsx b/frontend/src/components/features/settings/org-defaults-banner.tsx
new file mode 100644
index 0000000000..b6d2c7a877
--- /dev/null
+++ b/frontend/src/components/features/settings/org-defaults-banner.tsx
@@ -0,0 +1,16 @@
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import { OrgWideSettingsBadge } from "#/components/features/settings/org-wide-settings-badge";
+
+export function OrgDefaultsBanner() {
+ const { t } = useTranslation();
+
+ return (
+ <div className="flex flex-col gap-3">
+ <OrgWideSettingsBadge />
+ <p className="text-sm text-tertiary-alt">
+ {t(I18nKey.SETTINGS$ORG_DEFAULTS_INFO)}
+ </p>
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/sdk-settings/schema-field.tsx b/frontend/src/components/features/settings/sdk-settings/schema-field.tsx
new file mode 100644
index 0000000000..e0f32299aa
--- /dev/null
+++ b/frontend/src/components/features/settings/sdk-settings/schema-field.tsx
@@ -0,0 +1,200 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { OptionalTag } from "#/components/features/settings/optional-tag";
+import { SettingsDropdownInput } from "#/components/features/settings/settings-dropdown-input";
+import { SettingsInput } from "#/components/features/settings/settings-input";
+import { SettingsSwitch } from "#/components/features/settings/settings-switch";
+import { SettingsFieldSchema } from "#/types/settings";
+import { HelpLink } from "#/ui/help-link";
+import { Typography } from "#/ui/typography";
+import {
+ getSettingsFieldConstraints,
+ resolveSchemaChoiceLabel,
+ resolveSchemaFieldDescription,
+ resolveSchemaFieldLabel,
+} from "#/utils/sdk-settings-field-metadata";
+import { cn } from "#/utils/utils";
+
+// ---------------------------------------------------------------------------
+// Help links – UI-only mapping from field keys to user-facing guidance.
+// Keys use conventional i18n pattern: SCHEMA$<PATH>$HELP_TEXT / HELP_LINK_TEXT
+// ---------------------------------------------------------------------------
+export const FIELD_HELP_LINKS: Record<
+ string,
+ { textKey: string; linkTextKey: string; href: string }
+> = {
+ "llm.api_key": {
+ textKey: "SCHEMA$LLM$API_KEY$HELP_TEXT",
+ linkTextKey: "SCHEMA$LLM$API_KEY$HELP_LINK_TEXT",
+ href: "https://docs.openhands.dev/usage/local-setup#getting-an-api-key",
+ },
+};
+
+function FieldHelp({ field }: { field: SettingsFieldSchema }) {
+ const { t } = useTranslation();
+ const helpLink = FIELD_HELP_LINKS[field.key];
+ const description = resolveSchemaFieldDescription(
+ t,
+ field.key,
+ field.description,
+ );
+
+ return (
+ <>
+ {description ? (
+ <Typography.Paragraph className="text-tertiary-alt text-xs leading-5">
+ {description}
+ </Typography.Paragraph>
+ ) : null}
+ {helpLink ? (
+ <HelpLink
+ testId={`help-link-${field.key}`}
+ text={t(helpLink.textKey)}
+ linkText={t(helpLink.linkTextKey)}
+ href={helpLink.href}
+ size="settings"
+ linkColor="white"
+ />
+ ) : null}
+ </>
+ );
+}
+
+function isSelectField(field: SettingsFieldSchema): boolean {
+ return field.choices.length > 0;
+}
+
+function isBooleanField(field: SettingsFieldSchema): boolean {
+ return field.value_type === "boolean" && !isSelectField(field);
+}
+
+function isJsonField(field: SettingsFieldSchema): boolean {
+ return field.value_type === "array" || field.value_type === "object";
+}
+
+function isUrlField(field: SettingsFieldSchema): boolean {
+ return field.key.endsWith("url") || field.key.endsWith("_url");
+}
+
+function getInputType(
+ field: SettingsFieldSchema,
+): React.HTMLInputTypeAttribute {
+ if (field.secret) {
+ return "password";
+ }
+ if (field.value_type === "integer" || field.value_type === "number") {
+ return "number";
+ }
+ if (field.value_type === "string" && isUrlField(field)) {
+ return "url";
+ }
+ return "text";
+}
+
+export function SchemaField({
+ field,
+ value,
+ isDisabled,
+ onChange,
+}: {
+ field: SettingsFieldSchema;
+ value: string | boolean;
+ isDisabled: boolean;
+ onChange: (value: string | boolean) => void;
+}) {
+ const { t } = useTranslation();
+ const label = resolveSchemaFieldLabel(t, field.key, field.label);
+ const constraints = getSettingsFieldConstraints(field.key);
+
+ if (isBooleanField(field)) {
+ return (
+ <div className="flex flex-col gap-1.5">
+ <SettingsSwitch
+ testId={`sdk-settings-${field.key}`}
+ isToggled={Boolean(value)}
+ isDisabled={isDisabled}
+ onToggle={onChange}
+ >
+ {label}
+ </SettingsSwitch>
+ <FieldHelp field={field} />
+ </div>
+ );
+ }
+
+ if (isSelectField(field)) {
+ return (
+ <div className="flex flex-col gap-1.5">
+ <SettingsDropdownInput
+ testId={`sdk-settings-${field.key}`}
+ name={field.key}
+ label={label}
+ items={field.choices.map((choice) => ({
+ key: String(choice.value),
+ label: resolveSchemaChoiceLabel(
+ t,
+ field.key,
+ choice.value,
+ choice.label,
+ ),
+ }))}
+ selectedKey={value === "" ? undefined : String(value)}
+ isClearable={!field.required}
+ required={field.required}
+ showOptionalTag={!field.required}
+ isDisabled={isDisabled}
+ onSelectionChange={(selectedKey) =>
+ onChange(String(selectedKey ?? ""))
+ }
+ />
+ <FieldHelp field={field} />
+ </div>
+ );
+ }
+
+ if (isJsonField(field)) {
+ return (
+ <label className="flex flex-col gap-2.5 w-full">
+ <div className="flex items-center gap-2">
+ <span className="text-sm">{label}</span>
+ {!field.required ? <OptionalTag /> : null}
+ </div>
+ <textarea
+ data-testid={`sdk-settings-${field.key}`}
+ name={field.key}
+ value={String(value ?? "")}
+ required={field.required}
+ disabled={isDisabled}
+ onChange={(event) => onChange(event.target.value)}
+ className={cn(
+ "bg-tertiary border border-[#717888] min-h-32 w-full rounded-sm p-2 font-mono text-sm",
+ "placeholder:italic placeholder:text-tertiary-alt",
+ "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ )}
+ />
+ <FieldHelp field={field} />
+ </label>
+ );
+ }
+
+ return (
+ <div className="flex flex-col gap-1.5">
+ <SettingsInput
+ testId={`sdk-settings-${field.key}`}
+ name={field.key}
+ label={label}
+ type={getInputType(field)}
+ value={String(value ?? "")}
+ required={field.required}
+ showOptionalTag={!field.required}
+ isDisabled={isDisabled}
+ onChange={onChange}
+ className="w-full"
+ min={constraints?.min}
+ max={constraints?.max}
+ step={constraints?.step}
+ />
+ <FieldHelp field={field} />
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/sdk-settings/sdk-section-page.tsx b/frontend/src/components/features/settings/sdk-settings/sdk-section-page.tsx
new file mode 100644
index 0000000000..f30e42562d
--- /dev/null
+++ b/frontend/src/components/features/settings/sdk-settings/sdk-section-page.tsx
@@ -0,0 +1,325 @@
+import React from "react";
+import { AxiosError } from "axios";
+import { useTranslation } from "react-i18next";
+import { BrandButton } from "#/components/features/settings/brand-button";
+import { LlmSettingsInputsSkeleton } from "#/components/features/settings/llm-settings/llm-settings-inputs-skeleton";
+import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
+import { usePermission } from "#/hooks/organizations/use-permissions";
+import {
+ useAgentSettingsSchema,
+ useConversationSettingsSchema,
+} from "#/hooks/query/use-agent-settings-schema";
+import { useConfig } from "#/hooks/query/use-config";
+import { useMe } from "#/hooks/query/use-me";
+import { useSettings } from "#/hooks/query/use-settings";
+import { I18nKey } from "#/i18n/declaration";
+import { Typography } from "#/ui/typography";
+import { Settings, SettingsSchema, SettingsScope } from "#/types/settings";
+import {
+ displayErrorToast,
+ displaySuccessToast,
+} from "#/utils/custom-toast-handlers";
+import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";
+import {
+ buildInitialSettingsFormValues,
+ buildSdkSettingsPayloadForView,
+ getVisibleSettingsSections,
+ hasAdvancedSettings,
+ hasMinorSettings,
+ inferInitialView,
+ SettingsDirtyState,
+ SettingsFormValues,
+ type SettingsValueSource,
+ type SettingsView,
+} from "#/utils/sdk-settings-schema";
+import { SchemaField } from "./schema-field";
+import { ViewToggle } from "./view-toggle";
+
+const EMPTY_EXCLUDE_KEYS = new Set<string>();
+
+const VIEW_ORDER: Record<SettingsView, number> = {
+ basic: 0,
+ advanced: 1,
+ all: 2,
+};
+
+const getLessDetailedView = (
+ currentView: SettingsView,
+ nextView: SettingsView,
+): SettingsView =>
+ VIEW_ORDER[nextView] < VIEW_ORDER[currentView] ? nextView : currentView;
+
+export interface SdkSectionHeaderProps {
+ values: SettingsFormValues;
+ isDisabled: boolean;
+ view: SettingsView;
+ onChange: (key: string, value: string | boolean) => void;
+}
+
+/**
+ * A generic SDK-schema–driven settings page that renders fields
+ * from one or more schema sections.
+ *
+ * @param sectionKeys - which schema section(s) this page owns (e.g. ["condenser"])
+ * @param excludeKeys - field keys to skip (rendered elsewhere by the caller)
+ * @param header - optional render prop receiving shared state to render above fields
+ * @param testId - data-testid for the page wrapper
+ */
+export function SdkSectionPage({
+ sectionKeys,
+ excludeKeys = EMPTY_EXCLUDE_KEYS,
+ scope = "personal",
+ settingsSource = "agent_settings",
+ header,
+ extraDirty = false,
+ buildPayload,
+ onSaveSuccess,
+ getInitialView,
+ testId = "sdk-section-settings-screen",
+}: {
+ sectionKeys: string[];
+ excludeKeys?: Set<string>;
+ scope?: SettingsScope;
+ settingsSource?: SettingsValueSource;
+
+ header?: (props: SdkSectionHeaderProps) => React.ReactNode;
+ extraDirty?: boolean;
+ buildPayload?: (
+ payload: ReturnType<typeof buildSdkSettingsPayloadForView>,
+ context: {
+ values: SettingsFormValues;
+ dirty: SettingsDirtyState;
+ view: SettingsView;
+ },
+ ) => Record<string, unknown>;
+ onSaveSuccess?: () => void;
+ getInitialView?: (
+ settings: Settings,
+ filteredSchema: SettingsSchema,
+ ) => SettingsView;
+ testId?: string;
+}) {
+ const { t } = useTranslation();
+ const { mutate: saveSettings, isPending } = useSaveSettings(scope);
+ const { data: settings, isLoading, isFetching } = useSettings(scope);
+ const agentSchemaQuery = useAgentSettingsSchema(
+ settings?.agent_settings_schema,
+ );
+ const conversationSchemaQuery = useConversationSettingsSchema(
+ settings?.conversation_settings_schema,
+ );
+ const schema =
+ settingsSource === "conversation_settings"
+ ? conversationSchemaQuery.data
+ : agentSchemaQuery.data;
+ const isSchemaLoading =
+ settingsSource === "conversation_settings"
+ ? conversationSchemaQuery.isLoading
+ : agentSchemaQuery.isLoading;
+ const { data: config } = useConfig();
+ const { data: me } = useMe();
+ const { hasPermission } = usePermission(me?.role ?? "member");
+
+ const isOssMode = config?.app_mode === "oss";
+ const isReadOnly =
+ scope === "org" && !isOssMode ? !hasPermission("edit_llm_settings") : false;
+
+ const [view, setView] = React.useState<SettingsView>("basic");
+ const [values, setValues] = React.useState<SettingsFormValues>({});
+ const [dirty, setDirty] = React.useState<SettingsDirtyState>({});
+ const hasHydratedViewRef = React.useRef(false);
+
+ const sectionKeysSignature = React.useMemo(
+ () => JSON.stringify(sectionKeys),
+ [sectionKeys],
+ );
+ const stableSectionKeys = React.useMemo(
+ () => JSON.parse(sectionKeysSignature) as string[],
+ [sectionKeysSignature],
+ );
+
+ // Build a filtered schema containing only the requested sections
+ const filteredSchema = React.useMemo(() => {
+ if (!schema) return null;
+ const sectionSet = new Set(stableSectionKeys);
+ return {
+ ...schema,
+ sections: schema.sections.filter((s) => sectionSet.has(s.key)),
+ };
+ }, [schema, stableSectionKeys]);
+
+ const showAdvanced = hasAdvancedSettings(filteredSchema);
+ const showAll = hasMinorSettings(filteredSchema);
+
+ const initialValues = React.useMemo(() => {
+ if (!settings || !filteredSchema) return null;
+ return buildInitialSettingsFormValues(
+ settings,
+ filteredSchema,
+ settingsSource,
+ );
+ }, [settings, filteredSchema, settingsSource]);
+
+ const initialView = React.useMemo(() => {
+ if (!settings || !filteredSchema) return null;
+ return getInitialView
+ ? getInitialView(settings, filteredSchema)
+ : inferInitialView(settings, filteredSchema, settingsSource);
+ }, [settings, filteredSchema, getInitialView, settingsSource]);
+
+ React.useEffect(() => {
+ hasHydratedViewRef.current = false;
+ setView("basic");
+ setValues({});
+ setDirty({});
+ }, [scope, settingsSource, sectionKeysSignature]);
+
+ React.useEffect(() => {
+ if (!initialValues || !initialView) return;
+
+ setValues(initialValues);
+ setDirty({});
+ setView((currentView) => {
+ if (!hasHydratedViewRef.current) {
+ hasHydratedViewRef.current = true;
+ return initialView;
+ }
+
+ return getLessDetailedView(currentView, initialView);
+ });
+ }, [initialValues, initialView]);
+
+ const visibleSections = React.useMemo(() => {
+ if (!filteredSchema) return [];
+ return getVisibleSettingsSections(
+ filteredSchema,
+ values,
+ view,
+ excludeKeys,
+ );
+ }, [filteredSchema, values, view, excludeKeys]);
+
+ const handleFieldChange = React.useCallback(
+ (fieldKey: string, nextValue: string | boolean) => {
+ setValues((prev) => ({ ...prev, [fieldKey]: nextValue }));
+ setDirty((prev) => ({ ...prev, [fieldKey]: true }));
+ },
+ [],
+ );
+
+ const handleError = React.useCallback(
+ (error: AxiosError) => {
+ const msg = retrieveAxiosErrorMessage(error);
+ displayErrorToast(msg || t(I18nKey.ERROR$GENERIC));
+ },
+ [t],
+ );
+
+ const handleSave = () => {
+ if (!filteredSchema || isReadOnly) return;
+
+ let payload: Record<string, unknown>;
+ try {
+ const basePayload = buildSdkSettingsPayloadForView(
+ filteredSchema,
+ values,
+ dirty,
+ view,
+ );
+ const defaultPayload =
+ settingsSource === "conversation_settings"
+ ? { conversation_settings: basePayload }
+ : { agent_settings: basePayload };
+ payload = buildPayload
+ ? buildPayload(basePayload, { values, dirty, view })
+ : defaultPayload;
+ } catch (error) {
+ displayErrorToast(
+ error instanceof Error ? error.message : t(I18nKey.ERROR$GENERIC),
+ );
+ return;
+ }
+
+ if (Object.keys(payload).length === 0) return;
+
+ saveSettings(payload, {
+ onError: handleError,
+ onSuccess: () => {
+ displaySuccessToast(t(I18nKey.SETTINGS$SAVED_WARNING));
+ setDirty({});
+ onSaveSuccess?.();
+ },
+ });
+ };
+
+ if (isLoading || isFetching || isSchemaLoading) {
+ return <LlmSettingsInputsSkeleton />;
+ }
+
+ if (!filteredSchema || filteredSchema.sections.length === 0) {
+ return (
+ <Typography.Paragraph className="text-tertiary-alt">
+ {t(I18nKey.SETTINGS$SDK_SCHEMA_UNAVAILABLE)}
+ </Typography.Paragraph>
+ );
+ }
+
+ if (Object.keys(values).length === 0) return <LlmSettingsInputsSkeleton />;
+
+ return (
+ <div data-testid={testId} className="h-full relative">
+ <ViewToggle
+ view={view}
+ setView={setView}
+ showAdvanced={showAdvanced}
+ showAll={showAll}
+ isDisabled={isReadOnly}
+ />
+
+ <div className="flex flex-col gap-8 pb-20">
+ {header?.({
+ values,
+ isDisabled: isReadOnly,
+ view,
+ onChange: handleFieldChange,
+ })}
+
+ {visibleSections.map((section) => (
+ <section key={section.key} className="flex flex-col gap-4">
+ <div className="grid gap-4 xl:grid-cols-2">
+ {section.fields.map((field) => (
+ <SchemaField
+ key={field.key}
+ field={field}
+ value={values[field.key]}
+ isDisabled={isReadOnly}
+ onChange={(nextValue) =>
+ handleFieldChange(field.key, nextValue)
+ }
+ />
+ ))}
+ </div>
+ </section>
+ ))}
+ </div>
+
+ {!isReadOnly ? (
+ <div className="sticky bottom-0 bg-base py-4">
+ <BrandButton
+ testId="save-button"
+ type="button"
+ variant="primary"
+ isDisabled={
+ isPending || (Object.keys(dirty).length === 0 && !extraDirty)
+ }
+ onClick={handleSave}
+ >
+ {isPending
+ ? t(I18nKey.SETTINGS$SAVING)
+ : t(I18nKey.SETTINGS$SAVE_CHANGES)}
+ </BrandButton>
+ </div>
+ ) : null}
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/sdk-settings/view-toggle.tsx b/frontend/src/components/features/settings/sdk-settings/view-toggle.tsx
new file mode 100644
index 0000000000..c07342bc0a
--- /dev/null
+++ b/frontend/src/components/features/settings/sdk-settings/view-toggle.tsx
@@ -0,0 +1,60 @@
+import { useTranslation } from "react-i18next";
+import { BrandButton } from "#/components/features/settings/brand-button";
+import { I18nKey } from "#/i18n/declaration";
+import { SettingsView } from "#/utils/sdk-settings-schema";
+
+interface ViewToggleProps {
+ view: SettingsView;
+ setView: (view: SettingsView) => void;
+ showAdvanced: boolean;
+ showAll: boolean;
+ isDisabled?: boolean;
+}
+
+export function ViewToggle({
+ view,
+ setView,
+ showAdvanced,
+ showAll,
+ isDisabled = false,
+}: ViewToggleProps) {
+ const { t } = useTranslation();
+
+ if (!showAdvanced && !showAll) return null;
+
+ return (
+ <div className="flex items-center gap-2 mb-6">
+ <BrandButton
+ testId="sdk-section-basic-toggle"
+ variant={view === "basic" ? "primary" : "secondary"}
+ type="button"
+ isDisabled={isDisabled}
+ onClick={() => setView("basic")}
+ >
+ {t(I18nKey.SETTINGS$BASIC)}
+ </BrandButton>
+ {showAdvanced ? (
+ <BrandButton
+ testId="sdk-section-advanced-toggle"
+ variant={view === "advanced" ? "primary" : "secondary"}
+ type="button"
+ isDisabled={isDisabled}
+ onClick={() => setView("advanced")}
+ >
+ {t(I18nKey.SETTINGS$ADVANCED)}
+ </BrandButton>
+ ) : null}
+ {showAll ? (
+ <BrandButton
+ testId="sdk-section-all-toggle"
+ variant={view === "all" ? "primary" : "secondary"}
+ type="button"
+ isDisabled={isDisabled}
+ onClick={() => setView("all")}
+ >
+ {t(I18nKey.SETTINGS$ALL)}
+ </BrandButton>
+ ) : null}
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/settings-dropdown-input.tsx b/frontend/src/components/features/settings/settings-dropdown-input.tsx
index 01b3ef5325..ef97275404 100644
--- a/frontend/src/components/features/settings/settings-dropdown-input.tsx
+++ b/frontend/src/components/features/settings/settings-dropdown-input.tsx
@@ -81,7 +81,7 @@ export function SettingsDropdownInput({
inputProps={{
classNames: {
inputWrapper: cn(
- "bg-tertiary border border-[#717888] h-10 w-full rounded-sm p-2 placeholder:italic",
+ "bg-tertiary border border-[#717888] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic",
inputWrapperClassName,
),
input: inputClassName,
diff --git a/frontend/src/components/features/settings/settings-input.tsx b/frontend/src/components/features/settings/settings-input.tsx
index 2a1da6f4c4..8b5908df15 100644
--- a/frontend/src/components/features/settings/settings-input.tsx
+++ b/frontend/src/components/features/settings/settings-input.tsx
@@ -64,7 +64,7 @@ export function SettingsInput({
required={required}
pattern={pattern}
className={cn(
- "bg-tertiary border border-[#717888] h-10 w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "bg-tertiary border border-[#717888] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
"disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
)}
/>
diff --git a/frontend/src/components/shared/modals/settings/model-selector.tsx b/frontend/src/components/shared/modals/settings/model-selector.tsx
index c6d8a64c08..7675f9622a 100644
--- a/frontend/src/components/shared/modals/settings/model-selector.tsx
+++ b/frontend/src/components/shared/modals/settings/model-selector.tsx
@@ -104,7 +104,7 @@ export function ModelSelector({
return (
<div
className={cn(
- "flex flex-col md:flex-row w-[full] max-w-[680px] justify-between gap-4 md:gap-[46px]",
+ "flex flex-col md:flex-row w-full max-w-[680px] justify-between gap-4 md:gap-[46px]",
wrapperClassName,
)}
>
diff --git a/frontend/src/components/shared/modals/settings/settings-form.tsx b/frontend/src/components/shared/modals/settings/settings-form.tsx
index c39dc057a8..38cec6b2b5 100644
--- a/frontend/src/components/shared/modals/settings/settings-form.tsx
+++ b/frontend/src/components/shared/modals/settings/settings-form.tsx
@@ -12,6 +12,7 @@ import { BrandButton } from "#/components/features/settings/brand-button";
import { SettingsInput } from "#/components/features/settings/settings-input";
import { HelpLink } from "#/ui/help-link";
import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
+import { getAgentSettingValue } from "#/utils/sdk-settings-schema";
import { SETTINGS_FORM } from "#/utils/constants";
interface SettingsFormProps {
@@ -38,9 +39,12 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
onSuccess: () => {
onClose();
+ const agentLlm =
+ ((newSettings.agent_settings as Record<string, unknown>)
+ ?.llm as Record<string, unknown>) ?? {};
posthog.capture("settings_saved", {
- LLM_MODEL: newSettings.llm_model,
- LLM_API_KEY_SET: newSettings.llm_api_key_set ? "SET" : "UNSET",
+ LLM_MODEL: agentLlm.model,
+ LLM_API_KEY_SET: agentLlm.api_key ? "SET" : "UNSET",
SEARCH_API_KEY_SET: newSettings.search_api_key ? "SET" : "UNSET",
REMOTE_RUNTIME_RESOURCE_FACTOR:
newSettings.remote_runtime_resource_factor,
@@ -66,6 +70,7 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
};
const isLLMKeySet = settings.llm_api_key_set;
+ const currentModel = getAgentSettingValue(settings, "llm.model");
return (
<div>
@@ -77,7 +82,9 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
>
<div className="flex flex-col gap-[17px]">
<ModelSelector
- currentModel={settings.llm_model}
+ currentModel={
+ typeof currentModel === "string" ? currentModel : undefined
+ }
wrapperClassName="!flex-col !gap-[17px]"
labelClassName={SETTINGS_FORM.LABEL_CLASSNAME}
/>
@@ -96,7 +103,7 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
testId="llm-api-key-help-anchor"
text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
- href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
+ href="https://docs.openhands.dev/usage/local-setup#getting-an-api-key"
size="settings"
linkColor="white"
/>
diff --git a/frontend/src/constants/settings-nav.tsx b/frontend/src/constants/settings-nav.tsx
index c6264cb970..e2f34d1b8c 100644
--- a/frontend/src/constants/settings-nav.tsx
+++ b/frontend/src/constants/settings-nav.tsx
@@ -2,6 +2,8 @@ import { FiUsers, FiBriefcase } from "react-icons/fi";
import CreditCardIcon from "#/icons/credit-card.svg?react";
import KeyIcon from "#/icons/key.svg?react";
import LightbulbIcon from "#/icons/lightbulb.svg?react";
+import LockIcon from "#/icons/lock.svg?react";
+import MemoryIcon from "#/icons/memory_icon.svg?react";
import ServerProcessIcon from "#/icons/server-process.svg?react";
import SettingsGearIcon from "#/icons/settings-gear.svg?react";
import CircuitIcon from "#/icons/u-circuit.svg?react";
@@ -23,7 +25,6 @@ export interface SettingsNavItem {
}
export const SAAS_NAV_ITEMS: SettingsNavItem[] = [
- // Org settings section (Admin/Owner only)
{
icon: <FiBriefcase size={22} />,
to: "/settings/org",
@@ -38,11 +39,40 @@ export const SAAS_NAV_ITEMS: SettingsNavItem[] = [
},
{
icon: <CircuitIcon width={22} height={22} />,
- to: "/settings",
+ to: "/settings/org-defaults",
text: "COMMON$LANGUAGE_MODEL_LLM",
section: "org",
},
- // Personal settings section
+ {
+ icon: <MemoryIcon width={22} height={22} />,
+ to: "/settings/org-defaults/condenser",
+ text: "SETTINGS$NAV_CONDENSER",
+ section: "org",
+ },
+ {
+ icon: <LockIcon width={22} height={22} />,
+ to: "/settings/org-defaults/verification",
+ text: "SETTINGS$NAV_VERIFICATION",
+ section: "org",
+ },
+ {
+ icon: <CircuitIcon width={22} height={22} />,
+ to: "/settings",
+ text: "COMMON$LANGUAGE_MODEL_LLM",
+ section: "personal",
+ },
+ {
+ icon: <MemoryIcon width={22} height={22} />,
+ to: "/settings/condenser",
+ text: "SETTINGS$NAV_CONDENSER",
+ section: "personal",
+ },
+ {
+ icon: <LockIcon width={22} height={22} />,
+ to: "/settings/verification",
+ text: "SETTINGS$NAV_VERIFICATION",
+ section: "personal",
+ },
{
icon: <KeyIcon width={22} height={22} />,
to: "/settings/api-keys",
@@ -61,7 +91,6 @@ export const SAAS_NAV_ITEMS: SettingsNavItem[] = [
text: "SETTINGS$NAV_MCP",
section: "personal",
},
- // User settings section (no header shown)
{
icon: <UserIcon width={22} height={22} />,
to: "/settings/user",
@@ -74,14 +103,12 @@ export const SAAS_NAV_ITEMS: SettingsNavItem[] = [
text: "SETTINGS$NAV_APPLICATION",
section: "user",
},
- // Billing section (personal orgs only)
{
icon: <CreditCardIcon width={22} height={22} />,
to: "/settings/billing",
text: "SETTINGS$NAV_BILLING",
section: "billing",
},
- // Other items
{
icon: <PuzzlePieceIcon width={22} height={22} />,
to: "/settings/integrations",
@@ -102,6 +129,16 @@ export const OSS_NAV_ITEMS: SettingsNavItem[] = [
to: "/settings",
text: "SETTINGS$NAV_LLM",
},
+ {
+ icon: <MemoryIcon width={22} height={22} />,
+ to: "/settings/condenser",
+ text: "SETTINGS$NAV_CONDENSER",
+ },
+ {
+ icon: <LockIcon width={22} height={22} />,
+ to: "/settings/verification",
+ text: "SETTINGS$NAV_VERIFICATION",
+ },
{
icon: <ServerProcessIcon width={22} height={22} />,
to: "/settings/mcp",
diff --git a/frontend/src/hooks/mutation/use-add-mcp-server.ts b/frontend/src/hooks/mutation/use-add-mcp-server.ts
index bb90890f0d..18717282da 100644
--- a/frontend/src/hooks/mutation/use-add-mcp-server.ts
+++ b/frontend/src/hooks/mutation/use-add-mcp-server.ts
@@ -1,7 +1,13 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useSettings } from "#/hooks/query/use-settings";
import SettingsService from "#/api/settings-service/settings-service.api";
-import { MCPSSEServer, MCPStdioServer, MCPSHTTPServer } from "#/types/settings";
+import {
+ MCPSHTTPServer,
+ MCPConfig,
+ MCPSSEServer,
+ MCPStdioServer,
+} from "#/types/settings";
+import { parseMcpConfig, toSdkMcpConfig } from "#/utils/mcp-config";
import { useSelectedOrganizationId } from "#/context/use-selected-organization";
type MCPServerType = "sse" | "stdio" | "shttp";
@@ -26,13 +32,13 @@ export function useAddMcpServer() {
mutationFn: async (server: MCPServerConfig): Promise<void> => {
if (!settings) return;
- const currentConfig = settings.mcp_config || {
- sse_servers: [],
- stdio_servers: [],
- shttp_servers: [],
- };
+ const currentConfig = parseMcpConfig(settings.agent_settings?.mcp_config);
- const newConfig = { ...currentConfig };
+ const newConfig: MCPConfig = {
+ sse_servers: [...currentConfig.sse_servers],
+ stdio_servers: [...currentConfig.stdio_servers],
+ shttp_servers: [...currentConfig.shttp_servers],
+ };
if (server.type === "sse") {
const sseServer: MCPSSEServer = {
@@ -57,17 +63,13 @@ export function useAddMcpServer() {
newConfig.shttp_servers.push(shttpServer);
}
- const apiSettings = {
- mcp_config: newConfig,
- v1_enabled: settings.v1_enabled,
- };
-
- await SettingsService.saveSettings(apiSettings);
+ await SettingsService.saveSettings({
+ agent_settings: { mcp_config: toSdkMcpConfig(newConfig) },
+ });
},
onSuccess: () => {
- // Invalidate the settings query to trigger a refetch
queryClient.invalidateQueries({
- queryKey: ["settings", organizationId],
+ queryKey: ["settings", "personal", organizationId],
});
},
});
diff --git a/frontend/src/hooks/mutation/use-delete-mcp-server.ts b/frontend/src/hooks/mutation/use-delete-mcp-server.ts
index 03cdc7759d..90ff3b5b04 100644
--- a/frontend/src/hooks/mutation/use-delete-mcp-server.ts
+++ b/frontend/src/hooks/mutation/use-delete-mcp-server.ts
@@ -2,6 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useSettings } from "#/hooks/query/use-settings";
import SettingsService from "#/api/settings-service/settings-service.api";
import { MCPConfig } from "#/types/settings";
+import { parseMcpConfig, toSdkMcpConfig } from "#/utils/mcp-config";
import { useSelectedOrganizationId } from "#/context/use-selected-organization";
export function useDeleteMcpServer() {
@@ -11,9 +12,15 @@ export function useDeleteMcpServer() {
return useMutation({
mutationFn: async (serverId: string): Promise<void> => {
- if (!settings?.mcp_config) return;
+ const currentConfig = parseMcpConfig(
+ settings?.agent_settings?.mcp_config,
+ );
- const newConfig: MCPConfig = { ...settings.mcp_config };
+ const newConfig: MCPConfig = {
+ sse_servers: [...currentConfig.sse_servers],
+ stdio_servers: [...currentConfig.stdio_servers],
+ shttp_servers: [...currentConfig.shttp_servers],
+ };
const [serverType, indexStr] = serverId.split("-");
const index = parseInt(indexStr, 10);
@@ -25,17 +32,13 @@ export function useDeleteMcpServer() {
newConfig.shttp_servers.splice(index, 1);
}
- const apiSettings = {
- mcp_config: newConfig,
- v1_enabled: settings.v1_enabled,
- };
-
- await SettingsService.saveSettings(apiSettings);
+ await SettingsService.saveSettings({
+ agent_settings: { mcp_config: toSdkMcpConfig(newConfig) },
+ });
},
onSuccess: () => {
- // Invalidate the settings query to trigger a refetch
queryClient.invalidateQueries({
- queryKey: ["settings", organizationId],
+ queryKey: ["settings", "personal", organizationId],
});
},
});
diff --git a/frontend/src/hooks/mutation/use-save-settings.ts b/frontend/src/hooks/mutation/use-save-settings.ts
index 9ccfc04ca3..3b0be83638 100644
--- a/frontend/src/hooks/mutation/use-save-settings.ts
+++ b/frontend/src/hooks/mutation/use-save-settings.ts
@@ -1,66 +1,98 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { usePostHog } from "posthog-js/react";
-import { DEFAULT_SETTINGS } from "#/services/settings";
+import { useSelectedOrganizationId } from "#/context/use-selected-organization";
+import { organizationService } from "#/api/organization-service/organization-service.api";
import SettingsService from "#/api/settings-service/settings-service.api";
-import { Settings } from "#/types/settings";
+import {
+ MCPConfig,
+ Settings,
+ SettingsScope,
+ SettingsValue,
+} from "#/types/settings";
import { useSettings } from "../query/use-settings";
-import { useSelectedOrganizationId } from "#/context/use-selected-organization";
-const saveSettingsMutationFn = async (settings: Partial<Settings>) => {
- const settingsToSave: Partial<Settings> = {
- ...settings,
- agent: settings.agent || DEFAULT_SETTINGS.agent,
- language: settings.language || DEFAULT_SETTINGS.language,
- llm_api_key:
- settings.llm_api_key === ""
- ? ""
- : settings.llm_api_key?.trim() || undefined,
- condenser_max_size:
- settings.condenser_max_size ?? DEFAULT_SETTINGS.condenser_max_size,
- search_api_key: settings.search_api_key?.trim() || "",
- git_user_name:
- settings.git_user_name?.trim() || DEFAULT_SETTINGS.git_user_name,
- git_user_email:
- settings.git_user_email?.trim() || DEFAULT_SETTINGS.git_user_email,
+type SettingsUpdate = Partial<Settings> & Record<string, unknown>;
+
+const saveSettingsMutationFn = async (
+ scope: SettingsScope,
+ settings: SettingsUpdate,
+) => {
+ const settingsToSave: SettingsUpdate = { ...settings };
+ delete settingsToSave.agent_settings_schema;
+ delete settingsToSave.conversation_settings_schema;
+
+ const conversationSettings: Record<string, SettingsValue> = {
+ ...((settingsToSave.conversation_settings as Record<
+ string,
+ SettingsValue
+ >) ?? {}),
};
+ if (Object.keys(conversationSettings).length > 0) {
+ settingsToSave.conversation_settings = conversationSettings;
+ } else {
+ delete settingsToSave.conversation_settings;
+ }
+
+ const agentSettings = settingsToSave.agent_settings as
+ | Record<string, unknown>
+ | undefined;
+ const llmSettings = agentSettings?.llm as Record<string, unknown> | undefined;
+ if (llmSettings && typeof llmSettings.api_key === "string") {
+ const apiKey = llmSettings.api_key.trim();
+ llmSettings.api_key = apiKey === "" ? "" : apiKey;
+ }
+
+ if (typeof settingsToSave.search_api_key === "string") {
+ settingsToSave.search_api_key = settingsToSave.search_api_key.trim();
+ }
+ if (typeof settingsToSave.git_user_name === "string") {
+ settingsToSave.git_user_name = settingsToSave.git_user_name.trim();
+ }
+ if (typeof settingsToSave.git_user_email === "string") {
+ settingsToSave.git_user_email = settingsToSave.git_user_email.trim();
+ }
+
+ if (scope === "org") {
+ await organizationService.saveOrganizationAgentSettings(settingsToSave);
+ return;
+ }
+
await SettingsService.saveSettings(settingsToSave);
};
-export const useSaveSettings = () => {
+export const useSaveSettings = (scope: SettingsScope = "personal") => {
const posthog = usePostHog();
const queryClient = useQueryClient();
- const { data: currentSettings } = useSettings();
+ const { data: currentSettings } = useSettings(scope);
const { organizationId } = useSelectedOrganizationId();
return useMutation({
- mutationFn: async (settings: Partial<Settings>) => {
- const newSettings = { ...currentSettings, ...settings };
-
- // Track MCP configuration changes
- if (
- settings.mcp_config &&
- currentSettings?.mcp_config !== settings.mcp_config
- ) {
- const hasMcpConfig = !!settings.mcp_config;
- const sseServersCount = settings.mcp_config?.sse_servers?.length || 0;
- const stdioServersCount =
- settings.mcp_config?.stdio_servers?.length || 0;
+ mutationFn: async (settings: SettingsUpdate) => {
+ const nextMcpConfig = settings.mcp_config as MCPConfig | undefined;
+ const currentMcpConfig = currentSettings?.mcp_config as
+ | MCPConfig
+ | undefined;
- // Track MCP configuration usage
+ if (nextMcpConfig && currentMcpConfig !== nextMcpConfig) {
posthog.capture("mcp_config_updated", {
- has_mcp_config: hasMcpConfig,
- sse_servers_count: sseServersCount,
- stdio_servers_count: stdioServersCount,
+ has_mcp_config: true,
+ sse_servers_count: nextMcpConfig.sse_servers?.length || 0,
+ stdio_servers_count: nextMcpConfig.stdio_servers?.length || 0,
});
}
- await saveSettingsMutationFn(newSettings);
+ await saveSettingsMutationFn(scope, settings);
},
onSuccess: async () => {
await queryClient.invalidateQueries({
- queryKey: ["settings", organizationId],
+ queryKey: ["settings", scope, organizationId],
});
+ if (scope === "org") {
+ await queryClient.invalidateQueries({
+ queryKey: ["settings", "personal", organizationId],
+ });
+ }
},
meta: {
disableToast: true,
diff --git a/frontend/src/hooks/mutation/use-update-mcp-server.ts b/frontend/src/hooks/mutation/use-update-mcp-server.ts
index af2a9d173f..16713f1770 100644
--- a/frontend/src/hooks/mutation/use-update-mcp-server.ts
+++ b/frontend/src/hooks/mutation/use-update-mcp-server.ts
@@ -1,7 +1,13 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useSettings } from "#/hooks/query/use-settings";
import SettingsService from "#/api/settings-service/settings-service.api";
-import { MCPSSEServer, MCPStdioServer, MCPSHTTPServer } from "#/types/settings";
+import {
+ MCPSHTTPServer,
+ MCPConfig,
+ MCPSSEServer,
+ MCPStdioServer,
+} from "#/types/settings";
+import { parseMcpConfig, toSdkMcpConfig } from "#/utils/mcp-config";
import { useSelectedOrganizationId } from "#/context/use-selected-organization";
type MCPServerType = "sse" | "stdio" | "shttp";
@@ -30,9 +36,15 @@ export function useUpdateMcpServer() {
serverId: string;
server: MCPServerConfig;
}): Promise<void> => {
- if (!settings?.mcp_config) return;
+ const currentConfig = parseMcpConfig(
+ settings?.agent_settings?.mcp_config,
+ );
- const newConfig = { ...settings.mcp_config };
+ const newConfig: MCPConfig = {
+ sse_servers: [...currentConfig.sse_servers],
+ stdio_servers: [...currentConfig.stdio_servers],
+ shttp_servers: [...currentConfig.shttp_servers],
+ };
const [serverType, indexStr] = serverId.split("-");
const index = parseInt(indexStr, 10);
@@ -59,17 +71,13 @@ export function useUpdateMcpServer() {
newConfig.shttp_servers[index] = shttpServer;
}
- const apiSettings = {
- mcp_config: newConfig,
- v1_enabled: settings.v1_enabled,
- };
-
- await SettingsService.saveSettings(apiSettings);
+ await SettingsService.saveSettings({
+ agent_settings: { mcp_config: toSdkMcpConfig(newConfig) },
+ });
},
onSuccess: () => {
- // Invalidate the settings query to trigger a refetch
queryClient.invalidateQueries({
- queryKey: ["settings", organizationId],
+ queryKey: ["settings", "personal", organizationId],
});
},
});
diff --git a/frontend/src/hooks/query/use-agent-settings-schema.ts b/frontend/src/hooks/query/use-agent-settings-schema.ts
new file mode 100644
index 0000000000..fd9136d382
--- /dev/null
+++ b/frontend/src/hooks/query/use-agent-settings-schema.ts
@@ -0,0 +1,50 @@
+import { useQuery } from "@tanstack/react-query";
+import SettingsService from "#/api/settings-service/settings-service.api";
+import { useIsOnIntermediatePage } from "#/hooks/use-is-on-intermediate-page";
+import { SettingsSchema } from "#/types/settings";
+import { useIsAuthed } from "./use-is-authed";
+
+const useSettingsSchema = (
+ type: "agent" | "conversation",
+ fallbackSchema?: SettingsSchema | null,
+) => {
+ const isOnIntermediatePage = useIsOnIntermediatePage();
+ const { data: userIsAuthenticated } = useIsAuthed();
+ const { data, isLoading, isFetching } = useQuery({
+ queryKey: ["settings-schema", type],
+ queryFn:
+ type === "conversation"
+ ? SettingsService.getConversationSettingsSchema
+ : SettingsService.getSettingsSchema,
+ retry: false,
+ refetchOnWindowFocus: false,
+ staleTime: 1000 * 60 * 5,
+ gcTime: 1000 * 60 * 15,
+ enabled: !fallbackSchema && !isOnIntermediatePage && !!userIsAuthenticated,
+ meta: {
+ disableToast: true,
+ },
+ });
+
+ if (fallbackSchema) {
+ return {
+ data: fallbackSchema,
+ isLoading: false,
+ isFetching: false,
+ };
+ }
+
+ return {
+ data,
+ isLoading,
+ isFetching,
+ };
+};
+
+export const useAgentSettingsSchema = (
+ fallbackSchema?: SettingsSchema | null,
+) => useSettingsSchema("agent", fallbackSchema);
+
+export const useConversationSettingsSchema = (
+ fallbackSchema?: SettingsSchema | null,
+) => useSettingsSchema("conversation", fallbackSchema);
diff --git a/frontend/src/hooks/query/use-settings.ts b/frontend/src/hooks/query/use-settings.ts
index 686c37406b..a1aa5f26fd 100644
--- a/frontend/src/hooks/query/use-settings.ts
+++ b/frontend/src/hooks/query/use-settings.ts
@@ -1,19 +1,92 @@
import { useQuery } from "@tanstack/react-query";
-import SettingsService from "#/api/settings-service/settings-service.api";
-import { DEFAULT_SETTINGS } from "#/services/settings";
+import { useSelectedOrganizationId } from "#/context/use-selected-organization";
import { useIsOnIntermediatePage } from "#/hooks/use-is-on-intermediate-page";
-import { Settings } from "#/types/settings";
+import { DEFAULT_SETTINGS } from "#/services/settings";
+import { Settings, SettingsScope, SettingsValue } from "#/types/settings";
+import { organizationService } from "#/api/organization-service/organization-service.api";
+import SettingsService from "#/api/settings-service/settings-service.api";
import { useIsAuthed } from "./use-is-authed";
-import { useSelectedOrganizationId } from "#/context/use-selected-organization";
import { useConfig } from "./use-config";
+import {
+ pickFirstBoolean,
+ pickFirstNumber,
+ pickNullableString,
+} from "#/utils/settings-value-pickers";
+import { parseMcpConfig } from "#/utils/mcp-config";
+
+/** Look up a value in a nested object by dotted key path. */
+const lookupNested = (obj: Record<string, unknown>, key: string): unknown => {
+ const parts = key.split(".");
+ let current: unknown = obj;
+ for (const part of parts) {
+ if (current == null || typeof current !== "object") return undefined;
+ current = (current as Record<string, unknown>)[part];
+ }
+ return current;
+};
+
+const resolveSdkString = (
+ agentSettings: Record<string, unknown>,
+ key: string,
+ defaultValue: string,
+ allowEmpty = false,
+): string => {
+ const value = lookupNested(agentSettings, key);
+ if (typeof value === "string" && (value.length > 0 || allowEmpty)) {
+ return value;
+ }
+ return defaultValue;
+};
-export const getSettingsQueryFn = async (): Promise<Settings> => {
- const settings = await SettingsService.getSettings();
+const normalizeSettingsResponse = (settings: Partial<Settings>): Settings => {
+ const agentSettings = (settings.agent_settings ?? {}) as Record<
+ string,
+ unknown
+ >;
+ const conversationSettings = {
+ ...(DEFAULT_SETTINGS.conversation_settings ?? {}),
+ ...((settings.conversation_settings ?? {}) as Record<
+ string,
+ SettingsValue
+ >),
+ };
return {
+ ...DEFAULT_SETTINGS,
...settings,
+ llm_model: resolveSdkString(
+ agentSettings,
+ "llm.model",
+ DEFAULT_SETTINGS.llm_model,
+ ),
+ llm_base_url: resolveSdkString(
+ agentSettings,
+ "llm.base_url",
+ DEFAULT_SETTINGS.llm_base_url,
+ true,
+ ),
+ agent: resolveSdkString(agentSettings, "agent", DEFAULT_SETTINGS.agent),
+ llm_api_key: settings.llm_api_key ?? null,
+ llm_api_key_set: settings.llm_api_key_set ?? false,
+ confirmation_mode:
+ pickFirstBoolean(conversationSettings.confirmation_mode) ??
+ DEFAULT_SETTINGS.confirmation_mode,
+ security_analyzer:
+ pickNullableString(conversationSettings.security_analyzer) ??
+ DEFAULT_SETTINGS.security_analyzer,
+ max_iterations:
+ pickFirstNumber(conversationSettings.max_iterations) ??
+ DEFAULT_SETTINGS.max_iterations,
+ enable_default_condenser:
+ pickFirstBoolean(lookupNested(agentSettings, "condenser.enabled")) ??
+ DEFAULT_SETTINGS.enable_default_condenser,
condenser_max_size:
- settings.condenser_max_size ?? DEFAULT_SETTINGS.condenser_max_size,
+ pickFirstNumber(lookupNested(agentSettings, "condenser.max_size")) ??
+ DEFAULT_SETTINGS.condenser_max_size,
+ mcp_config: parseMcpConfig(
+ settings.mcp_config ??
+ (agentSettings.mcp_config as typeof settings.mcp_config),
+ ),
search_api_key: settings.search_api_key || "",
email: settings.email || "",
git_user_name: settings.git_user_name || DEFAULT_SETTINGS.git_user_name,
@@ -22,13 +95,30 @@ export const getSettingsQueryFn = async (): Promise<Settings> => {
disabled_skills:
settings.disabled_skills ?? DEFAULT_SETTINGS.disabled_skills,
v1_enabled: settings.v1_enabled ?? DEFAULT_SETTINGS.v1_enabled,
+ agent_settings_schema: settings.agent_settings_schema ?? null,
+ agent_settings: settings.agent_settings ?? DEFAULT_SETTINGS.agent_settings,
+ conversation_settings_schema:
+ settings.conversation_settings_schema ??
+ DEFAULT_SETTINGS.conversation_settings_schema,
+ conversation_settings: conversationSettings,
sandbox_grouping_strategy:
settings.sandbox_grouping_strategy ??
DEFAULT_SETTINGS.sandbox_grouping_strategy,
};
};
-export const useSettings = () => {
+export const getSettingsQueryFn = async (
+ scope: SettingsScope = "personal",
+): Promise<Settings> => {
+ const settings =
+ scope === "org"
+ ? await organizationService.getOrganizationAgentSettings()
+ : await SettingsService.getSettings();
+
+ return normalizeSettingsResponse(settings);
+};
+
+export const useSettings = (scope: SettingsScope = "personal") => {
const isOnIntermediatePage = useIsOnIntermediatePage();
const { data: userIsAuthenticated } = useIsAuthed();
const { organizationId } = useSelectedOrganizationId();
@@ -37,15 +127,12 @@ export const useSettings = () => {
const isOss = config?.app_mode === "oss";
const query = useQuery({
- queryKey: ["settings", organizationId],
- queryFn: getSettingsQueryFn,
- // Only retry if the error is not a 404 because we
- // would want to show the modal immediately if the
- // settings are not found
+ queryKey: ["settings", scope, organizationId],
+ queryFn: () => getSettingsQueryFn(scope),
retry: (_, error) => error.status !== 404,
refetchOnWindowFocus: false,
- staleTime: 1000 * 60 * 5, // 5 minutes
- gcTime: 1000 * 60 * 15, // 15 minutes
+ staleTime: 1000 * 60 * 5,
+ gcTime: 1000 * 60 * 15,
enabled:
!isOnIntermediatePage &&
!!userIsAuthenticated &&
diff --git a/frontend/src/hooks/use-auto-login.ts b/frontend/src/hooks/use-auto-login.ts
index 8d4cd2dee7..b0d1e411d3 100644
--- a/frontend/src/hooks/use-auto-login.ts
+++ b/frontend/src/hooks/use-auto-login.ts
@@ -3,6 +3,7 @@ import { useConfig } from "./query/use-config";
import { useIsAuthed } from "./query/use-is-authed";
import { getLoginMethod, LoginMethod } from "#/utils/local-storage";
import { useAuthUrl } from "./use-auth-url";
+import { useIsOnIntermediatePage } from "./use-is-on-intermediate-page";
/**
* Hook to automatically log in the user if they have a login method stored in local storage
@@ -11,6 +12,7 @@ import { useAuthUrl } from "./use-auth-url";
export const useAutoLogin = () => {
const { data: config, isLoading: isConfigLoading } = useConfig();
const { data: isAuthed, isLoading: isAuthLoading } = useIsAuthed();
+ const isOnIntermediatePage = useIsOnIntermediatePage();
// Get the stored login method
const loginMethod = getLoginMethod();
@@ -57,6 +59,11 @@ export const useAutoLogin = () => {
return;
}
+ // Don't auto-login from intermediate steps in the auth flow
+ if (isOnIntermediatePage) {
+ return;
+ }
+
// Don't auto-login if already authenticated
if (isAuthed) {
return;
@@ -95,10 +102,12 @@ export const useAutoLogin = () => {
isAuthed,
isConfigLoading,
isAuthLoading,
+ isOnIntermediatePage,
loginMethod,
githubAuthUrl,
gitlabAuthUrl,
bitbucketAuthUrl,
+ bitbucketDataCenterUrl,
enterpriseSsoUrl,
]);
};
diff --git a/frontend/src/hooks/use-settings-nav-items.ts b/frontend/src/hooks/use-settings-nav-items.ts
index 747643f870..dbc84034e3 100644
--- a/frontend/src/hooks/use-settings-nav-items.ts
+++ b/frontend/src/hooks/use-settings-nav-items.ts
@@ -71,6 +71,12 @@ export function useSettingsNavItems(): SettingsNavRenderedItem[] {
items = items.filter((item) => item.to !== "/settings/org-members");
}
+ if (!hasPermission("edit_llm_settings") || !organizationId || isPersonalOrg) {
+ items = items.filter(
+ (item) => !item.to.startsWith("/settings/org-defaults"),
+ );
+ }
+
// For OSS mode or non-SaaS, return flat list without sections
if (!isSaasMode) {
return items.map((item) => ({ type: "item", item }));
diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.ts
index c303833201..084da4b01e 100644
--- a/frontend/src/i18n/declaration.ts
+++ b/frontend/src/i18n/declaration.ts
@@ -104,6 +104,8 @@ export enum I18nKey {
HOME$RESOLVE_UNRESOLVED_COMMENTS = "HOME$RESOLVE_UNRESOLVED_COMMENTS",
HOME$LAUNCH = "HOME$LAUNCH",
SETTINGS$ADVANCED = "SETTINGS$ADVANCED",
+ SETTINGS$ALL = "SETTINGS$ALL",
+ SETTINGS$BASIC = "SETTINGS$BASIC",
SETTINGS$BASE_URL = "SETTINGS$BASE_URL",
SETTINGS$AGENT = "SETTINGS$AGENT",
SETTINGS$ENABLE_MEMORY_CONDENSATION = "SETTINGS$ENABLE_MEMORY_CONDENSATION",
@@ -119,6 +121,161 @@ export enum I18nKey {
ANALYTICS$CONFIRM_PREFERENCES = "ANALYTICS$CONFIRM_PREFERENCES",
SETTINGS$SAVING = "SETTINGS$SAVING",
SETTINGS$SAVE_CHANGES = "SETTINGS$SAVE_CHANGES",
+ SETTINGS$SDK_SCHEMA_UNAVAILABLE = "SETTINGS$SDK_SCHEMA_UNAVAILABLE",
+ SCHEMA$AGENT$DESCRIPTION = "SCHEMA$AGENT$DESCRIPTION",
+ SCHEMA$AGENT$LABEL = "SCHEMA$AGENT$LABEL",
+ SCHEMA$CONDENSER$ENABLED$DESCRIPTION = "SCHEMA$CONDENSER$ENABLED$DESCRIPTION",
+ SCHEMA$CONDENSER$ENABLED$LABEL = "SCHEMA$CONDENSER$ENABLED$LABEL",
+ SCHEMA$CONDENSER$MAX_SIZE$DESCRIPTION = "SCHEMA$CONDENSER$MAX_SIZE$DESCRIPTION",
+ SCHEMA$CONDENSER$MAX_SIZE$LABEL = "SCHEMA$CONDENSER$MAX_SIZE$LABEL",
+ SCHEMA$CONDENSER$SECTION_LABEL = "SCHEMA$CONDENSER$SECTION_LABEL",
+ SCHEMA$CONFIRMATION_MODE$DESCRIPTION = "SCHEMA$CONFIRMATION_MODE$DESCRIPTION",
+ SCHEMA$CONFIRMATION_MODE$LABEL = "SCHEMA$CONFIRMATION_MODE$LABEL",
+ SCHEMA$GENERAL$SECTION_LABEL = "SCHEMA$GENERAL$SECTION_LABEL",
+ SCHEMA$LLM$API_KEY$DESCRIPTION = "SCHEMA$LLM$API_KEY$DESCRIPTION",
+ SCHEMA$LLM$API_KEY$HELP_LINK_TEXT = "SCHEMA$LLM$API_KEY$HELP_LINK_TEXT",
+ SCHEMA$LLM$API_KEY$HELP_TEXT = "SCHEMA$LLM$API_KEY$HELP_TEXT",
+ SCHEMA$LLM$API_KEY$LABEL = "SCHEMA$LLM$API_KEY$LABEL",
+ SCHEMA$LLM$API_VERSION$DESCRIPTION = "SCHEMA$LLM$API_VERSION$DESCRIPTION",
+ SCHEMA$LLM$API_VERSION$LABEL = "SCHEMA$LLM$API_VERSION$LABEL",
+ SCHEMA$LLM$AWS_ACCESS_KEY_ID$DESCRIPTION = "SCHEMA$LLM$AWS_ACCESS_KEY_ID$DESCRIPTION",
+ SCHEMA$LLM$AWS_ACCESS_KEY_ID$LABEL = "SCHEMA$LLM$AWS_ACCESS_KEY_ID$LABEL",
+ SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$DESCRIPTION = "SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$DESCRIPTION",
+ SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$LABEL = "SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$LABEL",
+ SCHEMA$LLM$AWS_PROFILE_NAME$DESCRIPTION = "SCHEMA$LLM$AWS_PROFILE_NAME$DESCRIPTION",
+ SCHEMA$LLM$AWS_PROFILE_NAME$LABEL = "SCHEMA$LLM$AWS_PROFILE_NAME$LABEL",
+ SCHEMA$LLM$AWS_REGION_NAME$DESCRIPTION = "SCHEMA$LLM$AWS_REGION_NAME$DESCRIPTION",
+ SCHEMA$LLM$AWS_REGION_NAME$LABEL = "SCHEMA$LLM$AWS_REGION_NAME$LABEL",
+ SCHEMA$LLM$AWS_ROLE_NAME$DESCRIPTION = "SCHEMA$LLM$AWS_ROLE_NAME$DESCRIPTION",
+ SCHEMA$LLM$AWS_ROLE_NAME$LABEL = "SCHEMA$LLM$AWS_ROLE_NAME$LABEL",
+ SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$DESCRIPTION = "SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$DESCRIPTION",
+ SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$LABEL = "SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$LABEL",
+ SCHEMA$LLM$AWS_SESSION_NAME$DESCRIPTION = "SCHEMA$LLM$AWS_SESSION_NAME$DESCRIPTION",
+ SCHEMA$LLM$AWS_SESSION_NAME$LABEL = "SCHEMA$LLM$AWS_SESSION_NAME$LABEL",
+ SCHEMA$LLM$AWS_SESSION_TOKEN$DESCRIPTION = "SCHEMA$LLM$AWS_SESSION_TOKEN$DESCRIPTION",
+ SCHEMA$LLM$AWS_SESSION_TOKEN$LABEL = "SCHEMA$LLM$AWS_SESSION_TOKEN$LABEL",
+ SCHEMA$LLM$BASE_URL$DESCRIPTION = "SCHEMA$LLM$BASE_URL$DESCRIPTION",
+ SCHEMA$LLM$BASE_URL$LABEL = "SCHEMA$LLM$BASE_URL$LABEL",
+ SCHEMA$LLM$CACHING_PROMPT$DESCRIPTION = "SCHEMA$LLM$CACHING_PROMPT$DESCRIPTION",
+ SCHEMA$LLM$CACHING_PROMPT$LABEL = "SCHEMA$LLM$CACHING_PROMPT$LABEL",
+ SCHEMA$LLM$CUSTOM_TOKENIZER$DESCRIPTION = "SCHEMA$LLM$CUSTOM_TOKENIZER$DESCRIPTION",
+ SCHEMA$LLM$CUSTOM_TOKENIZER$LABEL = "SCHEMA$LLM$CUSTOM_TOKENIZER$LABEL",
+ SCHEMA$LLM$DISABLE_STOP_WORD$DESCRIPTION = "SCHEMA$LLM$DISABLE_STOP_WORD$DESCRIPTION",
+ SCHEMA$LLM$DISABLE_STOP_WORD$LABEL = "SCHEMA$LLM$DISABLE_STOP_WORD$LABEL",
+ SCHEMA$LLM$DISABLE_VISION$DESCRIPTION = "SCHEMA$LLM$DISABLE_VISION$DESCRIPTION",
+ SCHEMA$LLM$DISABLE_VISION$LABEL = "SCHEMA$LLM$DISABLE_VISION$LABEL",
+ SCHEMA$LLM$DROP_PARAMS$DESCRIPTION = "SCHEMA$LLM$DROP_PARAMS$DESCRIPTION",
+ SCHEMA$LLM$DROP_PARAMS$LABEL = "SCHEMA$LLM$DROP_PARAMS$LABEL",
+ SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$DESCRIPTION = "SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$DESCRIPTION",
+ SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$LABEL = "SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$LABEL",
+ SCHEMA$LLM$EXTENDED_THINKING_BUDGET$DESCRIPTION = "SCHEMA$LLM$EXTENDED_THINKING_BUDGET$DESCRIPTION",
+ SCHEMA$LLM$EXTENDED_THINKING_BUDGET$LABEL = "SCHEMA$LLM$EXTENDED_THINKING_BUDGET$LABEL",
+ SCHEMA$LLM$EXTRA_HEADERS$DESCRIPTION = "SCHEMA$LLM$EXTRA_HEADERS$DESCRIPTION",
+ SCHEMA$LLM$EXTRA_HEADERS$LABEL = "SCHEMA$LLM$EXTRA_HEADERS$LABEL",
+ SCHEMA$LLM$FORCE_STRING_SERIALIZER$DESCRIPTION = "SCHEMA$LLM$FORCE_STRING_SERIALIZER$DESCRIPTION",
+ SCHEMA$LLM$FORCE_STRING_SERIALIZER$LABEL = "SCHEMA$LLM$FORCE_STRING_SERIALIZER$LABEL",
+ SCHEMA$LLM$INPUT_COST_PER_TOKEN$DESCRIPTION = "SCHEMA$LLM$INPUT_COST_PER_TOKEN$DESCRIPTION",
+ SCHEMA$LLM$INPUT_COST_PER_TOKEN$LABEL = "SCHEMA$LLM$INPUT_COST_PER_TOKEN$LABEL",
+ SCHEMA$LLM$LITELLM_EXTRA_BODY$DESCRIPTION = "SCHEMA$LLM$LITELLM_EXTRA_BODY$DESCRIPTION",
+ SCHEMA$LLM$LITELLM_EXTRA_BODY$LABEL = "SCHEMA$LLM$LITELLM_EXTRA_BODY$LABEL",
+ SCHEMA$LLM$LOG_COMPLETIONS$DESCRIPTION = "SCHEMA$LLM$LOG_COMPLETIONS$DESCRIPTION",
+ SCHEMA$LLM$LOG_COMPLETIONS$LABEL = "SCHEMA$LLM$LOG_COMPLETIONS$LABEL",
+ SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$DESCRIPTION = "SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$DESCRIPTION",
+ SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$LABEL = "SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$LABEL",
+ SCHEMA$LLM$MAX_INPUT_TOKENS$DESCRIPTION = "SCHEMA$LLM$MAX_INPUT_TOKENS$DESCRIPTION",
+ SCHEMA$LLM$MAX_INPUT_TOKENS$LABEL = "SCHEMA$LLM$MAX_INPUT_TOKENS$LABEL",
+ SCHEMA$LLM$MAX_MESSAGE_CHARS$DESCRIPTION = "SCHEMA$LLM$MAX_MESSAGE_CHARS$DESCRIPTION",
+ SCHEMA$LLM$MAX_MESSAGE_CHARS$LABEL = "SCHEMA$LLM$MAX_MESSAGE_CHARS$LABEL",
+ SCHEMA$LLM$MAX_OUTPUT_TOKENS$DESCRIPTION = "SCHEMA$LLM$MAX_OUTPUT_TOKENS$DESCRIPTION",
+ SCHEMA$LLM$MAX_OUTPUT_TOKENS$LABEL = "SCHEMA$LLM$MAX_OUTPUT_TOKENS$LABEL",
+ SCHEMA$LLM$MODEL$DESCRIPTION = "SCHEMA$LLM$MODEL$DESCRIPTION",
+ SCHEMA$LLM$MODEL$LABEL = "SCHEMA$LLM$MODEL$LABEL",
+ SCHEMA$LLM$MODEL_CANONICAL_NAME$DESCRIPTION = "SCHEMA$LLM$MODEL_CANONICAL_NAME$DESCRIPTION",
+ SCHEMA$LLM$MODEL_CANONICAL_NAME$LABEL = "SCHEMA$LLM$MODEL_CANONICAL_NAME$LABEL",
+ SCHEMA$LLM$MODIFY_PARAMS$DESCRIPTION = "SCHEMA$LLM$MODIFY_PARAMS$DESCRIPTION",
+ SCHEMA$LLM$MODIFY_PARAMS$LABEL = "SCHEMA$LLM$MODIFY_PARAMS$LABEL",
+ SCHEMA$LLM$NATIVE_TOOL_CALLING$DESCRIPTION = "SCHEMA$LLM$NATIVE_TOOL_CALLING$DESCRIPTION",
+ SCHEMA$LLM$NATIVE_TOOL_CALLING$LABEL = "SCHEMA$LLM$NATIVE_TOOL_CALLING$LABEL",
+ SCHEMA$LLM$NUM_RETRIES$DESCRIPTION = "SCHEMA$LLM$NUM_RETRIES$DESCRIPTION",
+ SCHEMA$LLM$NUM_RETRIES$LABEL = "SCHEMA$LLM$NUM_RETRIES$LABEL",
+ SCHEMA$LLM$OLLAMA_BASE_URL$DESCRIPTION = "SCHEMA$LLM$OLLAMA_BASE_URL$DESCRIPTION",
+ SCHEMA$LLM$OLLAMA_BASE_URL$LABEL = "SCHEMA$LLM$OLLAMA_BASE_URL$LABEL",
+ SCHEMA$LLM$OPENROUTER_APP_NAME$DESCRIPTION = "SCHEMA$LLM$OPENROUTER_APP_NAME$DESCRIPTION",
+ SCHEMA$LLM$OPENROUTER_APP_NAME$LABEL = "SCHEMA$LLM$OPENROUTER_APP_NAME$LABEL",
+ SCHEMA$LLM$OPENROUTER_SITE_URL$DESCRIPTION = "SCHEMA$LLM$OPENROUTER_SITE_URL$DESCRIPTION",
+ SCHEMA$LLM$OPENROUTER_SITE_URL$LABEL = "SCHEMA$LLM$OPENROUTER_SITE_URL$LABEL",
+ SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$DESCRIPTION = "SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$DESCRIPTION",
+ SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$LABEL = "SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$LABEL",
+ SCHEMA$LLM$PROMPT_CACHE_RETENTION$DESCRIPTION = "SCHEMA$LLM$PROMPT_CACHE_RETENTION$DESCRIPTION",
+ SCHEMA$LLM$PROMPT_CACHE_RETENTION$LABEL = "SCHEMA$LLM$PROMPT_CACHE_RETENTION$LABEL",
+ SCHEMA$LLM$REASONING_EFFORT$CHOICE$HIGH = "SCHEMA$LLM$REASONING_EFFORT$CHOICE$HIGH",
+ SCHEMA$LLM$REASONING_EFFORT$CHOICE$LOW = "SCHEMA$LLM$REASONING_EFFORT$CHOICE$LOW",
+ SCHEMA$LLM$REASONING_EFFORT$CHOICE$MEDIUM = "SCHEMA$LLM$REASONING_EFFORT$CHOICE$MEDIUM",
+ SCHEMA$LLM$REASONING_EFFORT$CHOICE$NONE = "SCHEMA$LLM$REASONING_EFFORT$CHOICE$NONE",
+ SCHEMA$LLM$REASONING_EFFORT$CHOICE$XHIGH = "SCHEMA$LLM$REASONING_EFFORT$CHOICE$XHIGH",
+ SCHEMA$LLM$REASONING_EFFORT$DESCRIPTION = "SCHEMA$LLM$REASONING_EFFORT$DESCRIPTION",
+ SCHEMA$LLM$REASONING_EFFORT$LABEL = "SCHEMA$LLM$REASONING_EFFORT$LABEL",
+ SCHEMA$LLM$REASONING_SUMMARY$CHOICE$AUTO = "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$AUTO",
+ SCHEMA$LLM$REASONING_SUMMARY$CHOICE$CONCISE = "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$CONCISE",
+ SCHEMA$LLM$REASONING_SUMMARY$CHOICE$DETAILED = "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$DETAILED",
+ SCHEMA$LLM$REASONING_SUMMARY$DESCRIPTION = "SCHEMA$LLM$REASONING_SUMMARY$DESCRIPTION",
+ SCHEMA$LLM$REASONING_SUMMARY$LABEL = "SCHEMA$LLM$REASONING_SUMMARY$LABEL",
+ SCHEMA$LLM$RETRY_MAX_WAIT$DESCRIPTION = "SCHEMA$LLM$RETRY_MAX_WAIT$DESCRIPTION",
+ SCHEMA$LLM$RETRY_MAX_WAIT$LABEL = "SCHEMA$LLM$RETRY_MAX_WAIT$LABEL",
+ SCHEMA$LLM$RETRY_MIN_WAIT$DESCRIPTION = "SCHEMA$LLM$RETRY_MIN_WAIT$DESCRIPTION",
+ SCHEMA$LLM$RETRY_MIN_WAIT$LABEL = "SCHEMA$LLM$RETRY_MIN_WAIT$LABEL",
+ SCHEMA$LLM$RETRY_MULTIPLIER$DESCRIPTION = "SCHEMA$LLM$RETRY_MULTIPLIER$DESCRIPTION",
+ SCHEMA$LLM$RETRY_MULTIPLIER$LABEL = "SCHEMA$LLM$RETRY_MULTIPLIER$LABEL",
+ SCHEMA$LLM$SAFETY_SETTINGS$DESCRIPTION = "SCHEMA$LLM$SAFETY_SETTINGS$DESCRIPTION",
+ SCHEMA$LLM$SAFETY_SETTINGS$LABEL = "SCHEMA$LLM$SAFETY_SETTINGS$LABEL",
+ SCHEMA$LLM$SECTION_LABEL = "SCHEMA$LLM$SECTION_LABEL",
+ SCHEMA$LLM$SEED$DESCRIPTION = "SCHEMA$LLM$SEED$DESCRIPTION",
+ SCHEMA$LLM$SEED$LABEL = "SCHEMA$LLM$SEED$LABEL",
+ SCHEMA$LLM$STREAM$DESCRIPTION = "SCHEMA$LLM$STREAM$DESCRIPTION",
+ SCHEMA$LLM$STREAM$LABEL = "SCHEMA$LLM$STREAM$LABEL",
+ SCHEMA$LLM$TEMPERATURE$DESCRIPTION = "SCHEMA$LLM$TEMPERATURE$DESCRIPTION",
+ SCHEMA$LLM$TEMPERATURE$LABEL = "SCHEMA$LLM$TEMPERATURE$LABEL",
+ SCHEMA$LLM$TIMEOUT$DESCRIPTION = "SCHEMA$LLM$TIMEOUT$DESCRIPTION",
+ SCHEMA$LLM$TIMEOUT$LABEL = "SCHEMA$LLM$TIMEOUT$LABEL",
+ SCHEMA$LLM$TOP_K$DESCRIPTION = "SCHEMA$LLM$TOP_K$DESCRIPTION",
+ SCHEMA$LLM$TOP_K$LABEL = "SCHEMA$LLM$TOP_K$LABEL",
+ SCHEMA$LLM$TOP_P$DESCRIPTION = "SCHEMA$LLM$TOP_P$DESCRIPTION",
+ SCHEMA$LLM$TOP_P$LABEL = "SCHEMA$LLM$TOP_P$LABEL",
+ SCHEMA$LLM$USAGE_ID$DESCRIPTION = "SCHEMA$LLM$USAGE_ID$DESCRIPTION",
+ SCHEMA$LLM$USAGE_ID$LABEL = "SCHEMA$LLM$USAGE_ID$LABEL",
+ SCHEMA$MAX_ITERATIONS$DESCRIPTION = "SCHEMA$MAX_ITERATIONS$DESCRIPTION",
+ SCHEMA$MAX_ITERATIONS$LABEL = "SCHEMA$MAX_ITERATIONS$LABEL",
+ SCHEMA$MCP_CONFIG$DESCRIPTION = "SCHEMA$MCP_CONFIG$DESCRIPTION",
+ SCHEMA$MCP_CONFIG$LABEL = "SCHEMA$MCP_CONFIG$LABEL",
+ SCHEMA$SECURITY_ANALYZER$CHOICE$LLM = "SCHEMA$SECURITY_ANALYZER$CHOICE$LLM",
+ SCHEMA$SECURITY_ANALYZER$CHOICE$NONE = "SCHEMA$SECURITY_ANALYZER$CHOICE$NONE",
+ SCHEMA$SECURITY_ANALYZER$DESCRIPTION = "SCHEMA$SECURITY_ANALYZER$DESCRIPTION",
+ SCHEMA$SECURITY_ANALYZER$LABEL = "SCHEMA$SECURITY_ANALYZER$LABEL",
+ SCHEMA$TOOLS$DESCRIPTION = "SCHEMA$TOOLS$DESCRIPTION",
+ SCHEMA$TOOLS$LABEL = "SCHEMA$TOOLS$LABEL",
+ SCHEMA$VERIFICATION$CONFIRMATION_MODE$DESCRIPTION = "SCHEMA$VERIFICATION$CONFIRMATION_MODE$DESCRIPTION",
+ SCHEMA$VERIFICATION$CONFIRMATION_MODE$LABEL = "SCHEMA$VERIFICATION$CONFIRMATION_MODE$LABEL",
+ SCHEMA$VERIFICATION$CRITIC_ENABLED$DESCRIPTION = "SCHEMA$VERIFICATION$CRITIC_ENABLED$DESCRIPTION",
+ SCHEMA$VERIFICATION$CRITIC_ENABLED$LABEL = "SCHEMA$VERIFICATION$CRITIC_ENABLED$LABEL",
+ SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$ALL_ACTIONS = "SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$ALL_ACTIONS",
+ SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$FINISH_AND_MESSAGE = "SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$FINISH_AND_MESSAGE",
+ SCHEMA$VERIFICATION$CRITIC_MODE$DESCRIPTION = "SCHEMA$VERIFICATION$CRITIC_MODE$DESCRIPTION",
+ SCHEMA$VERIFICATION$CRITIC_MODE$LABEL = "SCHEMA$VERIFICATION$CRITIC_MODE$LABEL",
+ SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$DESCRIPTION = "SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$DESCRIPTION",
+ SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$LABEL = "SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$LABEL",
+ SCHEMA$VERIFICATION$CRITIC_SERVER_URL$DESCRIPTION = "SCHEMA$VERIFICATION$CRITIC_SERVER_URL$DESCRIPTION",
+ SCHEMA$VERIFICATION$CRITIC_SERVER_URL$LABEL = "SCHEMA$VERIFICATION$CRITIC_SERVER_URL$LABEL",
+ SCHEMA$VERIFICATION$CRITIC_THRESHOLD$DESCRIPTION = "SCHEMA$VERIFICATION$CRITIC_THRESHOLD$DESCRIPTION",
+ SCHEMA$VERIFICATION$CRITIC_THRESHOLD$LABEL = "SCHEMA$VERIFICATION$CRITIC_THRESHOLD$LABEL",
+ SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$DESCRIPTION = "SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$DESCRIPTION",
+ SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$LABEL = "SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$LABEL",
+ SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$DESCRIPTION = "SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$DESCRIPTION",
+ SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$LABEL = "SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$LABEL",
+ SCHEMA$VERIFICATION$SECTION_LABEL = "SCHEMA$VERIFICATION$SECTION_LABEL",
+ SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$LLM = "SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$LLM",
+ SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$NONE = "SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$NONE",
+ SCHEMA$VERIFICATION$SECURITY_ANALYZER$DESCRIPTION = "SCHEMA$VERIFICATION$SECURITY_ANALYZER$DESCRIPTION",
+ SCHEMA$VERIFICATION$SECURITY_ANALYZER$LABEL = "SCHEMA$VERIFICATION$SECURITY_ANALYZER$LABEL",
SETTINGS$NAV_INTEGRATIONS = "SETTINGS$NAV_INTEGRATIONS",
SETTINGS$NAV_APPLICATION = "SETTINGS$NAV_APPLICATION",
SETTINGS$NAV_BILLING = "SETTINGS$NAV_BILLING",
@@ -129,6 +286,8 @@ export enum I18nKey {
SETTINGS$ORG_SETTINGS_HEADER = "SETTINGS$ORG_SETTINGS_HEADER",
SETTINGS$PERSONAL_SETTINGS_HEADER = "SETTINGS$PERSONAL_SETTINGS_HEADER",
SETTINGS$ORG_WIDE_SETTING_BADGE = "SETTINGS$ORG_WIDE_SETTING_BADGE",
+ SETTINGS$ORG_DEFAULTS_INFO = "SETTINGS$ORG_DEFAULTS_INFO",
+ SETTINGS$PERSONAL_AGENT_INFO = "SETTINGS$PERSONAL_AGENT_INFO",
SETTINGS$GITHUB = "SETTINGS$GITHUB",
SETTINGS$AZURE_DEVOPS = "SETTINGS$AZURE_DEVOPS",
SETTINGS$SLACK = "SETTINGS$SLACK",
@@ -137,7 +296,9 @@ export enum I18nKey {
SETTINGS$GITLAB_REINSTALL_WEBHOOK = "SETTINGS$GITLAB_REINSTALL_WEBHOOK",
SETTINGS$GITLAB_INSTALLING_WEBHOOK = "SETTINGS$GITLAB_INSTALLING_WEBHOOK",
SETTINGS$GITLAB = "SETTINGS$GITLAB",
+ SETTINGS$NAV_CONDENSER = "SETTINGS$NAV_CONDENSER",
SETTINGS$NAV_LLM = "SETTINGS$NAV_LLM",
+ SETTINGS$NAV_VERIFICATION = "SETTINGS$NAV_VERIFICATION",
GIT$MERGE_REQUEST = "GIT$MERGE_REQUEST",
GIT$GITLAB_API = "GIT$GITLAB_API",
GIT$PULL_REQUEST = "GIT$PULL_REQUEST",
diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.json
index 025c74ff5d..9136024e39 100644
--- a/frontend/src/i18n/translation.json
+++ b/frontend/src/i18n/translation.json
@@ -1767,6 +1767,40 @@
"uk": "Розширений",
"ca": "Avançat"
},
+ "SETTINGS$ALL": {
+ "en": "All",
+ "ja": "すべて",
+ "zh-CN": "全部",
+ "zh-TW": "全部",
+ "ko-KR": "전체",
+ "no": "Alle",
+ "ar": "الكل",
+ "de": "Alle",
+ "fr": "Tout",
+ "it": "Tutto",
+ "pt": "Tudo",
+ "es": "Todo",
+ "tr": "Tümü",
+ "uk": "Усі",
+ "ca": "Tots"
+ },
+ "SETTINGS$BASIC": {
+ "en": "Basic",
+ "ja": "基本",
+ "zh-CN": "基础",
+ "zh-TW": "基本",
+ "ko-KR": "기본",
+ "no": "Grunnleggende",
+ "it": "Base",
+ "pt": "Básico",
+ "es": "Básico",
+ "ar": "أساسي",
+ "fr": "De base",
+ "tr": "Temel",
+ "de": "Grundlegend",
+ "uk": "Базовий",
+ "ca": "Bàsic"
+ },
"SETTINGS$BASE_URL": {
"en": "Base URL",
"ja": "ベースURL",
@@ -2022,6 +2056,2641 @@
"uk": "Зберегти зміни",
"ca": "Desa els canvis"
},
+ "SETTINGS$SDK_SCHEMA_UNAVAILABLE": {
+ "en": "SDK settings schema unavailable.",
+ "ja": "SDK設定スキーマを利用できません。",
+ "zh-CN": "SDK 设置架构不可用。",
+ "zh-TW": "無法使用 SDK 設定結構描述。",
+ "ko-KR": "SDK 설정 스키마를 사용할 수 없습니다.",
+ "no": "SDK-innstillingsskjema er ikke tilgjengelig.",
+ "it": "Lo schema delle impostazioni SDK non è disponibile.",
+ "pt": "O esquema de configurações do SDK não está disponível.",
+ "es": "El esquema de configuración del SDK no está disponible.",
+ "ar": "مخطط إعدادات SDK غير متاح.",
+ "fr": "Le schéma des paramètres SDK n'est pas disponible.",
+ "tr": "SDK ayar şeması kullanılamıyor.",
+ "de": "Das SDK-Einstellungsschema ist nicht verfügbar.",
+ "uk": "Схема налаштувань SDK недоступна.",
+ "ca": "L'esquema de configuració de l'SDK no està disponible."
+ },
+ "SCHEMA$AGENT$DESCRIPTION": {
+ "en": "Agent class to use.",
+ "ja": "使用するエージェントクラス。",
+ "zh-CN": "要使用的代理类。",
+ "zh-TW": "要使用的代理類別。",
+ "ko-KR": "사용할 에이전트 클래스입니다.",
+ "no": "Agentklasse som skal brukes.",
+ "it": "Classe dell'agente da utilizzare.",
+ "pt": "Classe do agente a ser usada.",
+ "es": "Clase de agente a utilizar.",
+ "ar": "فئة الوكيل المراد استخدامها.",
+ "fr": "Classe d'agent à utiliser.",
+ "tr": "Kullanılacak ajan sınıfı.",
+ "de": "Zu verwendende Agentenklasse.",
+ "uk": "Клас агента для використання.",
+ "ca": "Classe d'agent a utilitzar."
+ },
+ "SCHEMA$AGENT$LABEL": {
+ "en": "Agent",
+ "ja": "エージェント",
+ "zh-CN": "代理",
+ "zh-TW": "代理",
+ "ko-KR": "에이전트",
+ "no": "Agent",
+ "it": "Agente",
+ "pt": "Agente",
+ "es": "Agente",
+ "ar": "الوكيل",
+ "fr": "Agent",
+ "tr": "Ajan",
+ "de": "Agent",
+ "uk": "Агент",
+ "ca": "Agent"
+ },
+ "SCHEMA$CONDENSER$ENABLED$DESCRIPTION": {
+ "en": "Enable the LLM summarizing condenser.",
+ "ja": "LLM要約コンデンサーを有効にします。",
+ "zh-CN": "启用LLM摘要压缩器。",
+ "zh-TW": "啟用LLM摘要壓縮器。",
+ "ko-KR": "LLM 요약 압축기를 활성화합니다.",
+ "no": "Aktiver LLM-oppsummeringskondensatoren.",
+ "it": "Abilita il condensatore di riepilogo LLM.",
+ "pt": "Habilitar o condensador de resumo do LLM.",
+ "es": "Habilitar el condensador de resumen del LLM.",
+ "ar": "تمكين مكثف تلخيص LLM.",
+ "fr": "Activer le condenseur de résumé LLM.",
+ "tr": "LLM özetleme yoğunlaştırıcısını etkinleştirin.",
+ "de": "LLM-Zusammenfassungskondensator aktivieren.",
+ "uk": "Увімкнути конденсатор резюмування LLM.",
+ "ca": "Habilitar el condensador de resum del LLM."
+ },
+ "SCHEMA$CONDENSER$ENABLED$LABEL": {
+ "en": "Enable Memory Condensation",
+ "ja": "メモリ圧縮を有効化",
+ "zh-CN": "启用内存压缩",
+ "zh-TW": "啟用記憶體壓縮",
+ "ko-KR": "메모리 압축 활성화",
+ "no": "Aktiver minnekondensering",
+ "it": "Abilita condensazione memoria",
+ "pt": "Habilitar condensação de memória",
+ "es": "Habilitar condensación de memoria",
+ "ar": "تمكين ضغط الذاكرة",
+ "fr": "Activer la condensation de mémoire",
+ "tr": "Bellek Yoğunlaştırmayı Etkinleştir",
+ "de": "Speicherkondensation aktivieren",
+ "uk": "Увімкнути конденсацію пам'яті",
+ "ca": "Habilitar condensació de memòria"
+ },
+ "SCHEMA$CONDENSER$MAX_SIZE$DESCRIPTION": {
+ "en": "Maximum number of events kept before the condenser runs.",
+ "ja": "コンデンサーが実行される前に保持されるイベントの最大数。",
+ "zh-CN": "压缩器运行前保留的最大事件数。",
+ "zh-TW": "壓縮器運行前保留的最大事件數。",
+ "ko-KR": "압축기가 실행되기 전에 유지되는 최대 이벤트 수입니다.",
+ "no": "Maksimalt antall hendelser som beholdes før kondensatoren kjører.",
+ "it": "Numero massimo di eventi conservati prima dell'esecuzione del condensatore.",
+ "pt": "Número máximo de eventos mantidos antes da execução do condensador.",
+ "es": "Número máximo de eventos mantenidos antes de que se ejecute el condensador.",
+ "ar": "الحد الأقصى لعدد الأحداث المحفوظة قبل تشغيل المكثف.",
+ "fr": "Nombre maximum d'événements conservés avant l'exécution du condenseur.",
+ "tr": "Yoğunlaştırıcı çalışmadan önce tutulan maksimum olay sayısı.",
+ "de": "Maximale Anzahl von Ereignissen vor der Ausführung des Kondensators.",
+ "uk": "Максимальна кількість подій до запуску конденсатора.",
+ "ca": "Nombre màxim d'esdeveniments abans que s'executi el condensador."
+ },
+ "SCHEMA$CONDENSER$MAX_SIZE$LABEL": {
+ "en": "Max Size",
+ "ja": "最大サイズ",
+ "zh-CN": "最大大小",
+ "zh-TW": "最大大小",
+ "ko-KR": "최대 크기",
+ "no": "Maks størrelse",
+ "it": "Dimensione massima",
+ "pt": "Tamanho máximo",
+ "es": "Tamaño máximo",
+ "ar": "الحجم الأقصى",
+ "fr": "Taille maximale",
+ "tr": "Maksimum Boyut",
+ "de": "Maximale Größe",
+ "uk": "Максимальний розмір",
+ "ca": "Mida màxima"
+ },
+ "SCHEMA$CONDENSER$SECTION_LABEL": {
+ "en": "Condenser",
+ "ja": "コンデンサー",
+ "zh-CN": "压缩器",
+ "zh-TW": "壓縮器",
+ "ko-KR": "압축기",
+ "no": "Kondensator",
+ "it": "Condensatore",
+ "pt": "Condensador",
+ "es": "Condensador",
+ "ar": "المكثف",
+ "fr": "Condenseur",
+ "tr": "Yoğunlaştırıcı",
+ "de": "Kondensator",
+ "uk": "Конденсатор",
+ "ca": "Condensador"
+ },
+ "SCHEMA$CONFIRMATION_MODE$DESCRIPTION": {
+ "en": "Require user confirmation before executing risky actions.",
+ "ja": "リスクの高いアクションを実行する前にユーザー確認を要求します。",
+ "zh-CN": "在执行有风险的操作之前要求用户确认。",
+ "zh-TW": "在執行有風險的操作之前要求用戶確認。",
+ "ko-KR": "위험한 작업을 실행하기 전에 사용자 확인을 요구합니다.",
+ "no": "Krev brukerbekreftelse før risikable handlinger utføres.",
+ "it": "Richiedi conferma dell'utente prima di eseguire azioni rischiose.",
+ "pt": "Exigir confirmação do usuário antes de executar ações arriscadas.",
+ "es": "Requerir confirmación del usuario antes de ejecutar acciones arriesgadas.",
+ "ar": "طلب تأكيد المستخدم قبل تنفيذ الإجراءات الخطرة.",
+ "fr": "Exiger la confirmation de l'utilisateur avant d'exécuter des actions risquées.",
+ "tr": "Riskli eylemleri gerçekleştirmeden önce kullanıcı onayı gerektirin.",
+ "de": "Benutzerbestätigung vor der Ausführung riskanter Aktionen erfordern.",
+ "uk": "Вимагати підтвердження користувача перед виконанням ризикованих дій.",
+ "ca": "Requerir confirmació de l'usuari abans d'executar accions arriscades."
+ },
+ "SCHEMA$CONFIRMATION_MODE$LABEL": {
+ "en": "Confirmation Mode",
+ "ja": "確認モード",
+ "zh-CN": "确认模式",
+ "zh-TW": "確認模式",
+ "ko-KR": "확인 모드",
+ "no": "Bekreftelsesmodus",
+ "it": "Modalità di conferma",
+ "pt": "Modo de confirmação",
+ "es": "Modo de confirmación",
+ "ar": "وضع التأكيد",
+ "fr": "Mode de confirmation",
+ "tr": "Onay Modu",
+ "de": "Bestätigungsmodus",
+ "uk": "Режим підтвердження",
+ "ca": "Mode de confirmació"
+ },
+ "SCHEMA$GENERAL$SECTION_LABEL": {
+ "en": "General",
+ "ja": "一般",
+ "zh-CN": "常规",
+ "zh-TW": "一般",
+ "ko-KR": "일반",
+ "no": "Generelt",
+ "it": "Generale",
+ "pt": "Geral",
+ "es": "General",
+ "ar": "عام",
+ "fr": "Général",
+ "tr": "Genel",
+ "de": "Allgemein",
+ "uk": "Загальні",
+ "ca": "General"
+ },
+ "SCHEMA$LLM$API_KEY$DESCRIPTION": {
+ "en": "API key for authenticating with the LLM provider.",
+ "ja": "LLMプロバイダーとの認証に使用するAPIキー。",
+ "zh-CN": "用于与LLM提供商进行身份验证的API密钥。",
+ "zh-TW": "用於與LLM提供者驗證的API金鑰。",
+ "ko-KR": "LLM 공급자와의 인증에 사용되는 API 키입니다.",
+ "no": "API-nøkkel for autentisering med LLM-leverandøren.",
+ "it": "Chiave API per l'autenticazione con il provider LLM.",
+ "pt": "Chave da API para autenticação com o provedor de LLM.",
+ "es": "Clave de API para la autenticación con el proveedor de LLM.",
+ "ar": "مفتاح API للمصادقة مع مزود LLM.",
+ "fr": "Clé API pour l'authentification auprès du fournisseur LLM.",
+ "tr": "LLM sağlayıcısıyla kimlik doğrulaması için API anahtarı.",
+ "de": "API-Schlüssel zur Authentifizierung beim LLM-Anbieter.",
+ "uk": "API ключ для автентифікації у постачальника LLM.",
+ "ca": "Clau d'API per a l'autenticació amb el proveïdor de LLM."
+ },
+ "SCHEMA$LLM$API_KEY$HELP_LINK_TEXT": {
+ "en": "Click here for instructions.",
+ "ja": "手順についてはこちらをクリック。",
+ "zh-CN": "点击此处查看说明。",
+ "zh-TW": "點擊此處查看說明。",
+ "ko-KR": "지침을 보려면 여기를 클릭하세요.",
+ "no": "Klikk her for instruksjoner.",
+ "it": "Clicca qui per le istruzioni.",
+ "pt": "Clique aqui para instruções.",
+ "es": "Haz clic aquí para ver las instrucciones.",
+ "ar": "انقر هنا للحصول على التعليمات.",
+ "fr": "Cliquez ici pour les instructions.",
+ "tr": "Talimatlar için buraya tıklayın.",
+ "de": "Klicken Sie hier für Anweisungen.",
+ "uk": "Натисніть тут для інструкцій.",
+ "ca": "Fes clic aquí per veure les instruccions."
+ },
+ "SCHEMA$LLM$API_KEY$HELP_TEXT": {
+ "en": "Don't know your API key?",
+ "ja": "APIキーがわかりませんか?",
+ "zh-CN": "不知道您的API密钥?",
+ "zh-TW": "不知道您的API金鑰?",
+ "ko-KR": "API 키를 모르시나요?",
+ "no": "Vet du ikke API-nøkkelen din?",
+ "it": "Non conosci la tua chiave API?",
+ "pt": "Não sabe sua chave de API?",
+ "es": "¿No conoces tu clave de API?",
+ "ar": "لا تعرف مفتاح API الخاص بك؟",
+ "fr": "Vous ne connaissez pas votre clé API ?",
+ "tr": "API anahtarınızı bilmiyor musunuz?",
+ "de": "Sie kennen Ihren API-Schlüssel nicht?",
+ "uk": "Не знаєте свій API ключ?",
+ "ca": "No coneixes la teva clau d'API?"
+ },
+ "SCHEMA$LLM$API_KEY$LABEL": {
+ "en": "API Key",
+ "ja": "APIキー",
+ "zh-CN": "API密钥",
+ "zh-TW": "API金鑰",
+ "ko-KR": "API 키",
+ "no": "API-nøkkel",
+ "it": "Chiave API",
+ "pt": "Chave da API",
+ "es": "Clave de API",
+ "ar": "مفتاح API",
+ "fr": "Clé API",
+ "tr": "API Anahtarı",
+ "de": "API-Schlüssel",
+ "uk": "API ключ",
+ "ca": "Clau d'API"
+ },
+ "SCHEMA$LLM$API_VERSION$DESCRIPTION": {
+ "en": "API version (e.g., Azure).",
+ "ja": "APIバージョン(例:Azure)。",
+ "zh-CN": "API版本(例如Azure)。",
+ "zh-TW": "API版本(例如Azure)。",
+ "ko-KR": "API 버전(예: Azure)입니다.",
+ "no": "API-versjon (f.eks. Azure).",
+ "it": "Versione API (es. Azure).",
+ "pt": "Versão da API (por exemplo, Azure).",
+ "es": "Versión de API (por ejemplo, Azure).",
+ "ar": "إصدار API (مثل Azure).",
+ "fr": "Version de l'API (par exemple, Azure).",
+ "tr": "API sürümü (örn. Azure).",
+ "de": "API-Version (z.B. Azure).",
+ "uk": "Версія API (наприклад, Azure).",
+ "ca": "Versió de l'API (p. ex., Azure)."
+ },
+ "SCHEMA$LLM$API_VERSION$LABEL": {
+ "en": "API Version",
+ "ja": "APIバージョン",
+ "zh-CN": "API版本",
+ "zh-TW": "API版本",
+ "ko-KR": "API 버전",
+ "no": "API-versjon",
+ "it": "Versione API",
+ "pt": "Versão da API",
+ "es": "Versión de API",
+ "ar": "إصدار API",
+ "fr": "Version de l'API",
+ "tr": "API Sürümü",
+ "de": "API-Version",
+ "uk": "Версія API",
+ "ca": "Versió de l'API"
+ },
+ "SCHEMA$LLM$AWS_ACCESS_KEY_ID$DESCRIPTION": {
+ "en": "AWS access key ID for authentication.",
+ "ja": "認証用のAWSアクセスキーID。",
+ "zh-CN": "用于身份验证的AWS访问密钥ID。",
+ "zh-TW": "用於身份驗證的AWS存取金鑰ID。",
+ "ko-KR": "인증을 위한 AWS 액세스 키 ID입니다.",
+ "no": "AWS tilgangsnøkkel-ID for autentisering.",
+ "it": "ID chiave di accesso AWS per l'autenticazione.",
+ "pt": "ID da chave de acesso AWS para autenticação.",
+ "es": "ID de clave de acceso de AWS para autenticación.",
+ "ar": "معرف مفتاح الوصول AWS للمصادقة.",
+ "fr": "ID de clé d'accès AWS pour l'authentification.",
+ "tr": "Kimlik doğrulama için AWS erişim anahtarı kimliği.",
+ "de": "AWS-Zugriffsschlüssel-ID für die Authentifizierung.",
+ "uk": "Ідентифікатор ключа доступу AWS для автентифікації.",
+ "ca": "ID de clau d'accés AWS per a l'autenticació."
+ },
+ "SCHEMA$LLM$AWS_ACCESS_KEY_ID$LABEL": {
+ "en": "AWS Access Key ID",
+ "ja": "AWSアクセスキーID",
+ "zh-CN": "AWS访问密钥ID",
+ "zh-TW": "AWS存取金鑰ID",
+ "ko-KR": "AWS 액세스 키 ID",
+ "no": "AWS tilgangsnøkkel-ID",
+ "it": "ID chiave di accesso AWS",
+ "pt": "ID da chave de acesso AWS",
+ "es": "ID de clave de acceso de AWS",
+ "ar": "معرف مفتاح الوصول AWS",
+ "fr": "ID de clé d'accès AWS",
+ "tr": "AWS Erişim Anahtarı Kimliği",
+ "de": "AWS-Zugriffsschlüssel-ID",
+ "uk": "Ідентифікатор ключа доступу AWS",
+ "ca": "ID de clau d'accés AWS"
+ },
+ "SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$DESCRIPTION": {
+ "en": "AWS Bedrock runtime endpoint URL.",
+ "ja": "AWS BedrockランタイムエンドポイントURL。",
+ "zh-CN": "AWS Bedrock运行时端点URL。",
+ "zh-TW": "AWS Bedrock執行階段端點URL。",
+ "ko-KR": "AWS Bedrock 런타임 엔드포인트 URL입니다.",
+ "no": "AWS Bedrock kjøretidsendepunkt-URL.",
+ "it": "URL dell'endpoint runtime AWS Bedrock.",
+ "pt": "URL do endpoint de tempo de execução AWS Bedrock.",
+ "es": "URL del punto de conexión de tiempo de ejecución de AWS Bedrock.",
+ "ar": "عنوان URL لنقطة نهاية وقت تشغيل AWS Bedrock.",
+ "fr": "URL du point de terminaison d'exécution AWS Bedrock.",
+ "tr": "AWS Bedrock çalışma zamanı uç noktası URL'si.",
+ "de": "URL des AWS Bedrock-Laufzeitendpunkts.",
+ "uk": "URL-адреса кінцевої точки виконання AWS Bedrock.",
+ "ca": "URL del punt de connexió de temps d'execució AWS Bedrock."
+ },
+ "SCHEMA$LLM$AWS_BEDROCK_RUNTIME_ENDPOINT$LABEL": {
+ "en": "AWS Bedrock Runtime Endpoint",
+ "ja": "AWS Bedrockランタイムエンドポイント",
+ "zh-CN": "AWS Bedrock运行时端点",
+ "zh-TW": "AWS Bedrock執行階段端點",
+ "ko-KR": "AWS Bedrock 런타임 엔드포인트",
+ "no": "AWS Bedrock kjøretidsendepunkt",
+ "it": "Endpoint runtime AWS Bedrock",
+ "pt": "Endpoint de tempo de execução AWS Bedrock",
+ "es": "Punto de conexión de tiempo de ejecución de AWS Bedrock",
+ "ar": "نقطة نهاية وقت تشغيل AWS Bedrock",
+ "fr": "Point de terminaison d'exécution AWS Bedrock",
+ "tr": "AWS Bedrock Çalışma Zamanı Uç Noktası",
+ "de": "AWS Bedrock-Laufzeitendpunkt",
+ "uk": "Кінцева точка виконання AWS Bedrock",
+ "ca": "Punt de connexió de temps d'execució AWS Bedrock"
+ },
+ "SCHEMA$LLM$AWS_PROFILE_NAME$DESCRIPTION": {
+ "en": "AWS profile name.",
+ "ja": "AWSプロファイル名。",
+ "zh-CN": "AWS配置文件名。",
+ "zh-TW": "AWS設定檔名稱。",
+ "ko-KR": "AWS 프로파일 이름입니다.",
+ "no": "AWS-profilnavn.",
+ "it": "Nome del profilo AWS.",
+ "pt": "Nome do perfil AWS.",
+ "es": "Nombre del perfil de AWS.",
+ "ar": "اسم ملف تعريف AWS.",
+ "fr": "Nom du profil AWS.",
+ "tr": "AWS profil adı.",
+ "de": "AWS-Profilname.",
+ "uk": "Назва профілю AWS.",
+ "ca": "Nom del perfil AWS."
+ },
+ "SCHEMA$LLM$AWS_PROFILE_NAME$LABEL": {
+ "en": "AWS Profile Name",
+ "ja": "AWSプロファイル名",
+ "zh-CN": "AWS配置文件名",
+ "zh-TW": "AWS設定檔名稱",
+ "ko-KR": "AWS 프로파일 이름",
+ "no": "AWS-profilnavn",
+ "it": "Nome profilo AWS",
+ "pt": "Nome do perfil AWS",
+ "es": "Nombre de perfil de AWS",
+ "ar": "اسم ملف تعريف AWS",
+ "fr": "Nom du profil AWS",
+ "tr": "AWS Profil Adı",
+ "de": "AWS-Profilname",
+ "uk": "Назва профілю AWS",
+ "ca": "Nom del perfil AWS"
+ },
+ "SCHEMA$LLM$AWS_REGION_NAME$DESCRIPTION": {
+ "en": "AWS region name.",
+ "ja": "AWSリージョン名。",
+ "zh-CN": "AWS区域名称。",
+ "zh-TW": "AWS區域名稱。",
+ "ko-KR": "AWS 리전 이름입니다.",
+ "no": "AWS-regionnavn.",
+ "it": "Nome della regione AWS.",
+ "pt": "Nome da região AWS.",
+ "es": "Nombre de la región de AWS.",
+ "ar": "اسم منطقة AWS.",
+ "fr": "Nom de la région AWS.",
+ "tr": "AWS bölge adı.",
+ "de": "AWS-Regionsname.",
+ "uk": "Назва регіону AWS.",
+ "ca": "Nom de la regió AWS."
+ },
+ "SCHEMA$LLM$AWS_REGION_NAME$LABEL": {
+ "en": "AWS Region Name",
+ "ja": "AWSリージョン名",
+ "zh-CN": "AWS区域名称",
+ "zh-TW": "AWS區域名稱",
+ "ko-KR": "AWS 리전 이름",
+ "no": "AWS-regionnavn",
+ "it": "Nome regione AWS",
+ "pt": "Nome da região AWS",
+ "es": "Nombre de región de AWS",
+ "ar": "اسم منطقة AWS",
+ "fr": "Nom de la région AWS",
+ "tr": "AWS Bölge Adı",
+ "de": "AWS-Regionsname",
+ "uk": "Назва регіону AWS",
+ "ca": "Nom de la regió AWS"
+ },
+ "SCHEMA$LLM$AWS_ROLE_NAME$DESCRIPTION": {
+ "en": "AWS role name for assuming roles.",
+ "ja": "ロールを引き受けるためのAWSロール名。",
+ "zh-CN": "用于承担角色的AWS角色名称。",
+ "zh-TW": "用於承擔角色的AWS角色名稱。",
+ "ko-KR": "역할 수임을 위한 AWS 역할 이름입니다.",
+ "no": "AWS-rollenavn for å påta seg roller.",
+ "it": "Nome del ruolo AWS per assumere ruoli.",
+ "pt": "Nome da função AWS para assumir funções.",
+ "es": "Nombre del rol de AWS para asumir roles.",
+ "ar": "اسم دور AWS لتولي الأدوار.",
+ "fr": "Nom du rôle AWS pour assumer des rôles.",
+ "tr": "Rol üstlenmek için AWS rol adı.",
+ "de": "AWS-Rollenname zum Übernehmen von Rollen.",
+ "uk": "Назва ролі AWS для прийняття ролей.",
+ "ca": "Nom del rol AWS per assumir rols."
+ },
+ "SCHEMA$LLM$AWS_ROLE_NAME$LABEL": {
+ "en": "AWS Role Name",
+ "ja": "AWSロール名",
+ "zh-CN": "AWS角色名称",
+ "zh-TW": "AWS角色名稱",
+ "ko-KR": "AWS 역할 이름",
+ "no": "AWS-rollenavn",
+ "it": "Nome ruolo AWS",
+ "pt": "Nome da função AWS",
+ "es": "Nombre de rol de AWS",
+ "ar": "اسم دور AWS",
+ "fr": "Nom du rôle AWS",
+ "tr": "AWS Rol Adı",
+ "de": "AWS-Rollenname",
+ "uk": "Назва ролі AWS",
+ "ca": "Nom del rol AWS"
+ },
+ "SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$DESCRIPTION": {
+ "en": "AWS secret access key for authentication.",
+ "ja": "認証用のAWSシークレットアクセスキー。",
+ "zh-CN": "用于身份验证的AWS秘密访问密钥。",
+ "zh-TW": "用於身份驗證的AWS秘密存取金鑰。",
+ "ko-KR": "인증을 위한 AWS 비밀 액세스 키입니다.",
+ "no": "AWS hemmelig tilgangsnøkkel for autentisering.",
+ "it": "Chiave di accesso segreta AWS per l'autenticazione.",
+ "pt": "Chave de acesso secreta AWS para autenticação.",
+ "es": "Clave de acceso secreta de AWS para autenticación.",
+ "ar": "مفتاح الوصول السري AWS للمصادقة.",
+ "fr": "Clé d'accès secrète AWS pour l'authentification.",
+ "tr": "Kimlik doğrulama için AWS gizli erişim anahtarı.",
+ "de": "Geheimer AWS-Zugriffsschlüssel für die Authentifizierung.",
+ "uk": "Секретний ключ доступу AWS для автентифікації.",
+ "ca": "Clau d'accés secreta AWS per a l'autenticació."
+ },
+ "SCHEMA$LLM$AWS_SECRET_ACCESS_KEY$LABEL": {
+ "en": "AWS Secret Access Key",
+ "ja": "AWSシークレットアクセスキー",
+ "zh-CN": "AWS秘密访问密钥",
+ "zh-TW": "AWS秘密存取金鑰",
+ "ko-KR": "AWS 비밀 액세스 키",
+ "no": "AWS hemmelig tilgangsnøkkel",
+ "it": "Chiave di accesso segreta AWS",
+ "pt": "Chave de acesso secreta AWS",
+ "es": "Clave de acceso secreta de AWS",
+ "ar": "مفتاح الوصول السري AWS",
+ "fr": "Clé d'accès secrète AWS",
+ "tr": "AWS Gizli Erişim Anahtarı",
+ "de": "Geheimer AWS-Zugriffsschlüssel",
+ "uk": "Секретний ключ доступу AWS",
+ "ca": "Clau d'accés secreta AWS"
+ },
+ "SCHEMA$LLM$AWS_SESSION_NAME$DESCRIPTION": {
+ "en": "AWS session name.",
+ "ja": "AWSセッション名。",
+ "zh-CN": "AWS会话名称。",
+ "zh-TW": "AWS會話名稱。",
+ "ko-KR": "AWS 세션 이름입니다.",
+ "no": "AWS-sesjonsnavn.",
+ "it": "Nome della sessione AWS.",
+ "pt": "Nome da sessão AWS.",
+ "es": "Nombre de la sesión de AWS.",
+ "ar": "اسم جلسة AWS.",
+ "fr": "Nom de la session AWS.",
+ "tr": "AWS oturum adı.",
+ "de": "AWS-Sitzungsname.",
+ "uk": "Назва сесії AWS.",
+ "ca": "Nom de la sessió AWS."
+ },
+ "SCHEMA$LLM$AWS_SESSION_NAME$LABEL": {
+ "en": "AWS Session Name",
+ "ja": "AWSセッション名",
+ "zh-CN": "AWS会话名称",
+ "zh-TW": "AWS會話名稱",
+ "ko-KR": "AWS 세션 이름",
+ "no": "AWS-sesjonsnavn",
+ "it": "Nome sessione AWS",
+ "pt": "Nome da sessão AWS",
+ "es": "Nombre de sesión de AWS",
+ "ar": "اسم جلسة AWS",
+ "fr": "Nom de la session AWS",
+ "tr": "AWS Oturum Adı",
+ "de": "AWS-Sitzungsname",
+ "uk": "Назва сесії AWS",
+ "ca": "Nom de la sessió AWS"
+ },
+ "SCHEMA$LLM$AWS_SESSION_TOKEN$DESCRIPTION": {
+ "en": "AWS session token for temporary credentials.",
+ "ja": "一時的な認証情報用のAWSセッショントークン。",
+ "zh-CN": "用于临时凭证的AWS会话令牌。",
+ "zh-TW": "用於臨時憑證的AWS會話令牌。",
+ "ko-KR": "임시 자격 증명을 위한 AWS 세션 토큰입니다.",
+ "no": "AWS sesjonstoken for midlertidige legitimasjoner.",
+ "it": "Token di sessione AWS per credenziali temporanee.",
+ "pt": "Token de sessão AWS para credenciais temporárias.",
+ "es": "Token de sesión de AWS para credenciales temporales.",
+ "ar": "رمز جلسة AWS لبيانات الاعتماد المؤقتة.",
+ "fr": "Jeton de session AWS pour les identifiants temporaires.",
+ "tr": "Geçici kimlik bilgileri için AWS oturum belirteci.",
+ "de": "AWS-Sitzungstoken für temporäre Anmeldedaten.",
+ "uk": "Токен сесії AWS для тимчасових облікових даних.",
+ "ca": "Token de sessió AWS per a credencials temporals."
+ },
+ "SCHEMA$LLM$AWS_SESSION_TOKEN$LABEL": {
+ "en": "AWS Session Token",
+ "ja": "AWSセッショントークン",
+ "zh-CN": "AWS会话令牌",
+ "zh-TW": "AWS會話令牌",
+ "ko-KR": "AWS 세션 토큰",
+ "no": "AWS sesjonstoken",
+ "it": "Token di sessione AWS",
+ "pt": "Token de sessão AWS",
+ "es": "Token de sesión de AWS",
+ "ar": "رمز جلسة AWS",
+ "fr": "Jeton de session AWS",
+ "tr": "AWS Oturum Belirteci",
+ "de": "AWS-Sitzungstoken",
+ "uk": "Токен сесії AWS",
+ "ca": "Token de sessió AWS"
+ },
+ "SCHEMA$LLM$BASE_URL$DESCRIPTION": {
+ "en": "Custom base URL.",
+ "ja": "カスタムベースURL。",
+ "zh-CN": "自定义基础URL。",
+ "zh-TW": "自定義基礎URL。",
+ "ko-KR": "사용자 정의 기본 URL입니다.",
+ "no": "Tilpasset basis-URL.",
+ "it": "URL di base personalizzato.",
+ "pt": "URL base personalizada.",
+ "es": "URL base personalizada.",
+ "ar": "عنوان URL أساسي مخصص.",
+ "fr": "URL de base personnalisée.",
+ "tr": "Özel temel URL.",
+ "de": "Benutzerdefinierte Basis-URL.",
+ "uk": "Користувацька базова URL-адреса.",
+ "ca": "URL base personalitzada."
+ },
+ "SCHEMA$LLM$BASE_URL$LABEL": {
+ "en": "Base URL",
+ "ja": "ベースURL",
+ "zh-CN": "基础URL",
+ "zh-TW": "基礎URL",
+ "ko-KR": "기본 URL",
+ "no": "Basis-URL",
+ "it": "URL di base",
+ "pt": "URL base",
+ "es": "URL base",
+ "ar": "عنوان URL الأساسي",
+ "fr": "URL de base",
+ "tr": "Temel URL",
+ "de": "Basis-URL",
+ "uk": "Базова URL-адреса",
+ "ca": "URL base"
+ },
+ "SCHEMA$LLM$CACHING_PROMPT$DESCRIPTION": {
+ "en": "Enable caching of prompts.",
+ "ja": "プロンプトのキャッシュを有効にします。",
+ "zh-CN": "启用提示缓存。",
+ "zh-TW": "啟用提示快取。",
+ "ko-KR": "프롬프트 캐싱을 활성화합니다.",
+ "no": "Aktiver hurtigbufring av ledetekster.",
+ "it": "Abilita la cache dei prompt.",
+ "pt": "Habilitar cache de prompts.",
+ "es": "Habilitar caché de prompts.",
+ "ar": "تمكين التخزين المؤقت للمطالبات.",
+ "fr": "Activer la mise en cache des prompts.",
+ "tr": "Promptların önbelleğe alınmasını etkinleştirin.",
+ "de": "Caching von Prompts aktivieren.",
+ "uk": "Увімкнути кешування промптів.",
+ "ca": "Habilitar memòria cau dels prompts."
+ },
+ "SCHEMA$LLM$CACHING_PROMPT$LABEL": {
+ "en": "Caching Prompt",
+ "ja": "プロンプトキャッシュ",
+ "zh-CN": "缓存提示",
+ "zh-TW": "快取提示",
+ "ko-KR": "프롬프트 캐싱",
+ "no": "Hurtigbufring av ledetekst",
+ "it": "Cache del prompt",
+ "pt": "Cache de prompt",
+ "es": "Caché de prompt",
+ "ar": "تخزين المطالبة مؤقتًا",
+ "fr": "Mise en cache du prompt",
+ "tr": "Prompt Önbelleğe Alma",
+ "de": "Prompt-Caching",
+ "uk": "Кешування промпту",
+ "ca": "Memòria cau del prompt"
+ },
+ "SCHEMA$LLM$CUSTOM_TOKENIZER$DESCRIPTION": {
+ "en": "Custom tokenizer for token counting.",
+ "ja": "トークンカウント用のカスタムトークナイザー。",
+ "zh-CN": "用于令牌计数的自定义分词器。",
+ "zh-TW": "用於權杖計數的自訂分詞器。",
+ "ko-KR": "토큰 카운팅을 위한 사용자 정의 토크나이저입니다.",
+ "no": "Tilpasset tokenizer for tokentelling.",
+ "it": "Tokenizer personalizzato per il conteggio dei token.",
+ "pt": "Tokenizador personalizado para contagem de tokens.",
+ "es": "Tokenizador personalizado para conteo de tokens.",
+ "ar": "محلل رموز مخصص لعد الرموز.",
+ "fr": "Tokenizer personnalisé pour le comptage des jetons.",
+ "tr": "Token sayımı için özel tokenizer.",
+ "de": "Benutzerdefinierter Tokenizer für Token-Zählung.",
+ "uk": "Користувацький токенізатор для підрахунку токенів.",
+ "ca": "Tokenitzador personalitzat per al comptatge de tokens."
+ },
+ "SCHEMA$LLM$CUSTOM_TOKENIZER$LABEL": {
+ "en": "Custom Tokenizer",
+ "ja": "カスタムトークナイザー",
+ "zh-CN": "自定义分词器",
+ "zh-TW": "自訂分詞器",
+ "ko-KR": "사용자 정의 토크나이저",
+ "no": "Tilpasset tokenizer",
+ "it": "Tokenizer personalizzato",
+ "pt": "Tokenizador personalizado",
+ "es": "Tokenizador personalizado",
+ "ar": "محلل رموز مخصص",
+ "fr": "Tokenizer personnalisé",
+ "tr": "Özel Tokenizer",
+ "de": "Benutzerdefinierter Tokenizer",
+ "uk": "Користувацький токенізатор",
+ "ca": "Tokenitzador personalitzat"
+ },
+ "SCHEMA$LLM$DISABLE_STOP_WORD$DESCRIPTION": {
+ "en": "Disable using stop words.",
+ "ja": "ストップワードの使用を無効にします。",
+ "zh-CN": "禁用停用词。",
+ "zh-TW": "停用停用詞。",
+ "ko-KR": "중지어 사용을 비활성화합니다.",
+ "no": "Deaktiver bruk av stoppord.",
+ "it": "Disabilita l'uso delle parole di arresto.",
+ "pt": "Desativar uso de palavras de parada.",
+ "es": "Deshabilitar el uso de palabras de parada.",
+ "ar": "تعطيل استخدام كلمات التوقف.",
+ "fr": "Désactiver l'utilisation des mots d'arrêt.",
+ "tr": "Durdurma sözcüklerinin kullanımını devre dışı bırakın.",
+ "de": "Verwendung von Stoppwörtern deaktivieren.",
+ "uk": "Вимкнути використання стоп-слів.",
+ "ca": "Desactivar l'ús de paraules de parada."
+ },
+ "SCHEMA$LLM$DISABLE_STOP_WORD$LABEL": {
+ "en": "Disable Stop Word",
+ "ja": "ストップワード無効化",
+ "zh-CN": "禁用停用词",
+ "zh-TW": "停用停用詞",
+ "ko-KR": "중지어 비활성화",
+ "no": "Deaktiver stoppord",
+ "it": "Disabilita parola di arresto",
+ "pt": "Desativar palavra de parada",
+ "es": "Deshabilitar palabra de parada",
+ "ar": "تعطيل كلمة التوقف",
+ "fr": "Désactiver le mot d'arrêt",
+ "tr": "Durdurma Sözcüğünü Devre Dışı Bırak",
+ "de": "Stoppwort deaktivieren",
+ "uk": "Вимкнути стоп-слово",
+ "ca": "Desactivar paraula de parada"
+ },
+ "SCHEMA$LLM$DISABLE_VISION$DESCRIPTION": {
+ "en": "Disable image processing for vision-capable models.",
+ "ja": "ビジョン対応モデルの画像処理を無効にします。",
+ "zh-CN": "禁用支持视觉的模型的图像处理。",
+ "zh-TW": "停用支援視覺的模型的圖像處理。",
+ "ko-KR": "비전 지원 모델의 이미지 처리를 비활성화합니다.",
+ "no": "Deaktiver bildebehandling for synskapable modeller.",
+ "it": "Disabilita l'elaborazione delle immagini per i modelli con capacità visiva.",
+ "pt": "Desativar processamento de imagem para modelos com capacidade de visão.",
+ "es": "Deshabilitar el procesamiento de imágenes para modelos con capacidad de visión.",
+ "ar": "تعطيل معالجة الصور للنماذج القادرة على الرؤية.",
+ "fr": "Désactiver le traitement d'image pour les modèles capables de vision.",
+ "tr": "Görme özellikli modeller için görüntü işlemeyi devre dışı bırakın.",
+ "de": "Bildverarbeitung für visionsfähige Modelle deaktivieren.",
+ "uk": "Вимкнути обробку зображень для моделей з підтримкою зору.",
+ "ca": "Desactivar el processament d'imatges per a models amb capacitat de visió."
+ },
+ "SCHEMA$LLM$DISABLE_VISION$LABEL": {
+ "en": "Disable Vision",
+ "ja": "ビジョン無効化",
+ "zh-CN": "禁用视觉",
+ "zh-TW": "停用視覺",
+ "ko-KR": "비전 비활성화",
+ "no": "Deaktiver visjon",
+ "it": "Disabilita visione",
+ "pt": "Desativar visão",
+ "es": "Deshabilitar visión",
+ "ar": "تعطيل الرؤية",
+ "fr": "Désactiver la vision",
+ "tr": "Görüntüyü Devre Dışı Bırak",
+ "de": "Vision deaktivieren",
+ "uk": "Вимкнути зір",
+ "ca": "Desactivar visió"
+ },
+ "SCHEMA$LLM$DROP_PARAMS$DESCRIPTION": {
+ "en": "Drop unsupported parameters.",
+ "ja": "サポートされていないパラメータを削除します。",
+ "zh-CN": "丢弃不支持的参数。",
+ "zh-TW": "丟棄不支持的參數。",
+ "ko-KR": "지원되지 않는 파라미터를 삭제합니다.",
+ "no": "Slipp ikke-støttede parametere.",
+ "it": "Elimina i parametri non supportati.",
+ "pt": "Descartar parâmetros não suportados.",
+ "es": "Descartar parámetros no admitidos.",
+ "ar": "إسقاط المعلمات غير المدعومة.",
+ "fr": "Supprimer les paramètres non pris en charge.",
+ "tr": "Desteklenmeyen parametreleri bırakın.",
+ "de": "Nicht unterstützte Parameter verwerfen.",
+ "uk": "Видалити непідтримувані параметри.",
+ "ca": "Descartar paràmetres no admesos."
+ },
+ "SCHEMA$LLM$DROP_PARAMS$LABEL": {
+ "en": "Drop Params",
+ "ja": "パラメータ削除",
+ "zh-CN": "丢弃参数",
+ "zh-TW": "丟棄參數",
+ "ko-KR": "파라미터 삭제",
+ "no": "Slipp parametere",
+ "it": "Elimina parametri",
+ "pt": "Descartar parâmetros",
+ "es": "Descartar parámetros",
+ "ar": "إسقاط المعلمات",
+ "fr": "Supprimer les paramètres",
+ "tr": "Parametreleri Bırak",
+ "de": "Parameter verwerfen",
+ "uk": "Видалити параметри",
+ "ca": "Descartar paràmetres"
+ },
+ "SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$DESCRIPTION": {
+ "en": "Request encrypted reasoning content in Responses API.",
+ "ja": "Responses APIで暗号化推論コンテンツを要求します。",
+ "zh-CN": "在Responses API中请求加密推理内容。",
+ "zh-TW": "在Responses API中請求加密推理內容。",
+ "ko-KR": "Responses API에서 암호화된 추론 콘텐츠를 요청합니다.",
+ "no": "Be om kryptert resonneringsinnhold i Responses API.",
+ "it": "Richiedi contenuto di ragionamento crittografato nell'API Responses.",
+ "pt": "Solicitar conteúdo de raciocínio criptografado na API Responses.",
+ "es": "Solicitar contenido de razonamiento cifrado en la API Responses.",
+ "ar": "طلب محتوى استدلال مشفر في واجهة برمجة تطبيقات Responses.",
+ "fr": "Demander du contenu de raisonnement chiffré dans l'API Responses.",
+ "tr": "Responses API'sinde şifreli akıl yürütme içeriği isteyin.",
+ "de": "Verschlüsselten Reasoning-Inhalt in der Responses API anfordern.",
+ "uk": "Запит зашифрованого вмісту міркування в API Responses.",
+ "ca": "Sol·licitar contingut de raonament xifrat a l'API Responses."
+ },
+ "SCHEMA$LLM$ENABLE_ENCRYPTED_REASONING$LABEL": {
+ "en": "Enable Encrypted Reasoning",
+ "ja": "暗号化推論を有効化",
+ "zh-CN": "启用加密推理",
+ "zh-TW": "啟用加密推理",
+ "ko-KR": "암호화된 추론 활성화",
+ "no": "Aktiver kryptert resonnering",
+ "it": "Abilita ragionamento crittografato",
+ "pt": "Habilitar raciocínio criptografado",
+ "es": "Habilitar razonamiento cifrado",
+ "ar": "تمكين الاستدلال المشفر",
+ "fr": "Activer le raisonnement chiffré",
+ "tr": "Şifreli Akıl Yürütmeyi Etkinleştir",
+ "de": "Verschlüsseltes Reasoning aktivieren",
+ "uk": "Увімкнути зашифроване міркування",
+ "ca": "Habilitar raonament xifrat"
+ },
+ "SCHEMA$LLM$EXTENDED_THINKING_BUDGET$DESCRIPTION": {
+ "en": "Budget tokens for extended thinking (Anthropic models).",
+ "ja": "拡張思考のためのバジェットトークン(Anthropicモデル)。",
+ "zh-CN": "扩展思考的预算令牌(Anthropic模型)。",
+ "zh-TW": "擴展思考的預算權杖(Anthropic模型)。",
+ "ko-KR": "확장 사고를 위한 예산 토큰(Anthropic 모델)입니다.",
+ "no": "Budsjetttokens for utvidet tenking (Anthropic-modeller).",
+ "it": "Token di budget per il pensiero esteso (modelli Anthropic).",
+ "pt": "Tokens de orçamento para pensamento estendido (modelos Anthropic).",
+ "es": "Tokens de presupuesto para pensamiento extendido (modelos Anthropic).",
+ "ar": "رموز الميزانية للتفكير الموسع (نماذج Anthropic).",
+ "fr": "Jetons de budget pour la réflexion étendue (modèles Anthropic).",
+ "tr": "Genişletilmiş düşünme için bütçe tokenları (Anthropic modelleri).",
+ "de": "Budget-Token für erweitertes Denken (Anthropic-Modelle).",
+ "uk": "Бюджетні токени для розширеного мислення (моделі Anthropic).",
+ "ca": "Tokens de pressupost per al pensament estès (models Anthropic)."
+ },
+ "SCHEMA$LLM$EXTENDED_THINKING_BUDGET$LABEL": {
+ "en": "Extended Thinking Budget",
+ "ja": "拡張思考バジェット",
+ "zh-CN": "扩展思考预算",
+ "zh-TW": "擴展思考預算",
+ "ko-KR": "확장 사고 예산",
+ "no": "Utvidet tenkebudsjett",
+ "it": "Budget di pensiero esteso",
+ "pt": "Orçamento de pensamento estendido",
+ "es": "Presupuesto de pensamiento extendido",
+ "ar": "ميزانية التفكير الموسعة",
+ "fr": "Budget de réflexion étendu",
+ "tr": "Genişletilmiş Düşünme Bütçesi",
+ "de": "Erweitertes Denkbudget",
+ "uk": "Бюджет розширеного мислення",
+ "ca": "Pressupost de pensament estès"
+ },
+ "SCHEMA$LLM$EXTRA_HEADERS$DESCRIPTION": {
+ "en": "Optional HTTP headers to forward to LiteLLM requests.",
+ "ja": "LiteLLMリクエストに転送するオプションのHTTPヘッダー。",
+ "zh-CN": "转发到LiteLLM请求的可选HTTP头。",
+ "zh-TW": "轉發到LiteLLM請求的可選HTTP標頭。",
+ "ko-KR": "LiteLLM 요청에 전달할 선택적 HTTP 헤더.",
+ "no": "Valgfrie HTTP-hoder å videresende til LiteLLM-forespørsler.",
+ "it": "Intestazioni HTTP opzionali da inoltrare alle richieste LiteLLM.",
+ "pt": "Cabeçalhos HTTP opcionais para encaminhar para solicitações LiteLLM.",
+ "es": "Encabezados HTTP opcionales para reenviar a las solicitudes de LiteLLM.",
+ "ar": "رؤوس HTTP اختيارية لإعادة توجيهها إلى طلبات LiteLLM.",
+ "fr": "En-têtes HTTP optionnels à transmettre aux requêtes LiteLLM.",
+ "tr": "LiteLLM isteklerine iletilecek isteğe bağlı HTTP başlıkları.",
+ "de": "Optionale HTTP-Header, die an LiteLLM-Anfragen weitergeleitet werden.",
+ "uk": "Додаткові HTTP-заголовки для передачі в запити LiteLLM.",
+ "ca": "Capçaleres HTTP opcionals per reenviar a les sol·licituds de LiteLLM."
+ },
+ "SCHEMA$LLM$EXTRA_HEADERS$LABEL": {
+ "en": "Extra Headers",
+ "ja": "追加ヘッダー",
+ "zh-CN": "额外头部",
+ "zh-TW": "額外標頭",
+ "ko-KR": "추가 헤더",
+ "no": "Ekstra hoder",
+ "it": "Intestazioni extra",
+ "pt": "Cabeçalhos extras",
+ "es": "Encabezados adicionales",
+ "ar": "رؤوس إضافية",
+ "fr": "En-têtes supplémentaires",
+ "tr": "Ek başlıklar",
+ "de": "Zusätzliche Header",
+ "uk": "Додаткові заголовки",
+ "ca": "Capçaleres addicionals"
+ },
+ "SCHEMA$LLM$FORCE_STRING_SERIALIZER$DESCRIPTION": {
+ "en": "Force using string content serializer.",
+ "ja": "文字列コンテンツシリアライザーの使用を強制する。",
+ "zh-CN": "强制使用字符串内容序列化器。",
+ "zh-TW": "強制使用字串內容序列化器。",
+ "ko-KR": "문자열 콘텐츠 직렬화기 사용을 강제합니다.",
+ "no": "Tving bruk av streng innholdsserializer.",
+ "it": "Forza l'uso del serializzatore di contenuti stringa.",
+ "pt": "Forçar o uso do serializador de conteúdo de string.",
+ "es": "Forzar el uso del serializador de contenido de cadena.",
+ "ar": "فرض استخدام مُسلسل محتوى السلسلة النصية.",
+ "fr": "Forcer l'utilisation du sérialiseur de contenu chaîne.",
+ "tr": "Dize içerik serileştiricisini kullanmaya zorla.",
+ "de": "Erzwinge die Verwendung des String-Content-Serializers.",
+ "uk": "Примусово використовувати серіалізатор рядкового вмісту.",
+ "ca": "Força l'ús del serialitzador de contingut de cadena."
+ },
+ "SCHEMA$LLM$FORCE_STRING_SERIALIZER$LABEL": {
+ "en": "Force String Serializer",
+ "ja": "文字列シリアライザーを強制",
+ "zh-CN": "强制字符串序列化器",
+ "zh-TW": "強制字串序列化器",
+ "ko-KR": "문자열 직렬화기 강제",
+ "no": "Tving strengserializer",
+ "it": "Forza serializzatore stringa",
+ "pt": "Forçar serializador de string",
+ "es": "Forzar serializador de cadena",
+ "ar": "فرض مُسلسل السلسلة النصية",
+ "fr": "Forcer le sérialiseur de chaîne",
+ "tr": "Dize serileştiriciyi zorla",
+ "de": "String-Serializer erzwingen",
+ "uk": "Примусовий рядковий серіалізатор",
+ "ca": "Força el serialitzador de cadena"
+ },
+ "SCHEMA$LLM$INPUT_COST_PER_TOKEN$DESCRIPTION": {
+ "en": "Cost per input token for logging purposes.",
+ "ja": "ログ記録用の入力トークンあたりのコスト。",
+ "zh-CN": "用于日志记录的每个输入令牌的成本。",
+ "zh-TW": "用於日誌記錄的每個輸入令牌的成本。",
+ "ko-KR": "로깅 목적의 입력 토큰당 비용.",
+ "no": "Kostnad per inndata-token for loggformål.",
+ "it": "Costo per token di input per scopi di registrazione.",
+ "pt": "Custo por token de entrada para fins de registro.",
+ "es": "Costo por token de entrada para fines de registro.",
+ "ar": "تكلفة لكل رمز إدخال لأغراض التسجيل.",
+ "fr": "Coût par jeton d'entrée à des fins de journalisation.",
+ "tr": "Günlükleme amaçlı giriş token başına maliyet.",
+ "de": "Kosten pro Eingabe-Token für Protokollierungszwecke.",
+ "uk": "Вартість за вхідний токен для цілей логування.",
+ "ca": "Cost per token d'entrada per a finalitats de registre."
+ },
+ "SCHEMA$LLM$INPUT_COST_PER_TOKEN$LABEL": {
+ "en": "Input Cost Per Token",
+ "ja": "トークンあたりの入力コスト",
+ "zh-CN": "每令牌输入成本",
+ "zh-TW": "每令牌輸入成本",
+ "ko-KR": "토큰당 입력 비용",
+ "no": "Inndatakostnad per token",
+ "it": "Costo di input per token",
+ "pt": "Custo de entrada por token",
+ "es": "Costo de entrada por token",
+ "ar": "تكلفة الإدخال لكل رمز",
+ "fr": "Coût d'entrée par jeton",
+ "tr": "Token başına giriş maliyeti",
+ "de": "Eingabekosten pro Token",
+ "uk": "Вартість введення за токен",
+ "ca": "Cost d'entrada per token"
+ },
+ "SCHEMA$LLM$LITELLM_EXTRA_BODY$DESCRIPTION": {
+ "en": "Additional parameters to pass to LiteLLM requests.",
+ "ja": "LiteLLMリクエストに渡す追加パラメータ。",
+ "zh-CN": "传递给LiteLLM请求的附加参数。",
+ "zh-TW": "傳遞給LiteLLM請求的附加參數。",
+ "ko-KR": "LiteLLM 요청에 전달할 추가 매개변수.",
+ "no": "Tilleggsparametere å sende til LiteLLM-forespørsler.",
+ "it": "Parametri aggiuntivi da passare alle richieste LiteLLM.",
+ "pt": "Parâmetros adicionais para passar às solicitações LiteLLM.",
+ "es": "Parámetros adicionales para pasar a las solicitudes de LiteLLM.",
+ "ar": "معلمات إضافية لتمريرها إلى طلبات LiteLLM.",
+ "fr": "Paramètres supplémentaires à transmettre aux requêtes LiteLLM.",
+ "tr": "LiteLLM isteklerine iletilecek ek parametreler.",
+ "de": "Zusätzliche Parameter, die an LiteLLM-Anfragen übergeben werden.",
+ "uk": "Додаткові параметри для передачі в запити LiteLLM.",
+ "ca": "Paràmetres addicionals per passar a les sol·licituds de LiteLLM."
+ },
+ "SCHEMA$LLM$LITELLM_EXTRA_BODY$LABEL": {
+ "en": "LiteLLM Extra Body",
+ "ja": "LiteLLM追加ボディ",
+ "zh-CN": "LiteLLM额外正文",
+ "zh-TW": "LiteLLM額外正文",
+ "ko-KR": "LiteLLM 추가 본문",
+ "no": "LiteLLM ekstra kropp",
+ "it": "Corpo extra LiteLLM",
+ "pt": "Corpo extra do LiteLLM",
+ "es": "Cuerpo extra de LiteLLM",
+ "ar": "جسم LiteLLM الإضافي",
+ "fr": "Corps supplémentaire LiteLLM",
+ "tr": "LiteLLM ekstra gövdesi",
+ "de": "LiteLLM Extra-Body",
+ "uk": "Додатковий вміст LiteLLM",
+ "ca": "Cos extra de LiteLLM"
+ },
+ "SCHEMA$LLM$LOG_COMPLETIONS$DESCRIPTION": {
+ "en": "Enable logging of completions.",
+ "ja": "補完のログ記録を有効にする。",
+ "zh-CN": "启用补全日志记录。",
+ "zh-TW": "啟用補全日誌記錄。",
+ "ko-KR": "완성 로깅을 활성화합니다.",
+ "no": "Aktiver logging av fullføringer.",
+ "it": "Abilita la registrazione dei completamenti.",
+ "pt": "Ativar registro de conclusões.",
+ "es": "Habilitar el registro de completaciones.",
+ "ar": "تمكين تسجيل الإكمالات.",
+ "fr": "Activer la journalisation des complétions.",
+ "tr": "Tamamlamaların günlüğe kaydedilmesini etkinleştir.",
+ "de": "Protokollierung von Vervollständigungen aktivieren.",
+ "uk": "Увімкнути логування завершень.",
+ "ca": "Activa el registre de les completacions."
+ },
+ "SCHEMA$LLM$LOG_COMPLETIONS$LABEL": {
+ "en": "Log Completions",
+ "ja": "補完をログ",
+ "zh-CN": "记录补全",
+ "zh-TW": "記錄補全",
+ "ko-KR": "완성 로그",
+ "no": "Logg fullføringer",
+ "it": "Registra completamenti",
+ "pt": "Registrar conclusões",
+ "es": "Registrar completaciones",
+ "ar": "تسجيل الإكمالات",
+ "fr": "Journaliser les complétions",
+ "tr": "Tamamlamaları günlüğe kaydet",
+ "de": "Vervollständigungen protokollieren",
+ "uk": "Логувати завершення",
+ "ca": "Registra les completacions"
+ },
+ "SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$DESCRIPTION": {
+ "en": "Folder to log LLM completions to.",
+ "ja": "LLM補完を記録するフォルダ。",
+ "zh-CN": "记录LLM补全的文件夹。",
+ "zh-TW": "記錄LLM補全的資料夾。",
+ "ko-KR": "LLM 완성을 기록할 폴더.",
+ "no": "Mappe for å logge LLM-fullføringer til.",
+ "it": "Cartella per registrare i completamenti LLM.",
+ "pt": "Pasta para registrar conclusões do LLM.",
+ "es": "Carpeta para registrar las completaciones del LLM.",
+ "ar": "مجلد لتسجيل إكمالات LLM.",
+ "fr": "Dossier pour enregistrer les complétions LLM.",
+ "tr": "LLM tamamlamalarının günlüğe kaydedileceği klasör.",
+ "de": "Ordner zum Protokollieren von LLM-Vervollständigungen.",
+ "uk": "Папка для логування завершень LLM.",
+ "ca": "Carpeta per registrar les completacions de l'LLM."
+ },
+ "SCHEMA$LLM$LOG_COMPLETIONS_FOLDER$LABEL": {
+ "en": "Log Completions Folder",
+ "ja": "補完ログフォルダ",
+ "zh-CN": "补全日志文件夹",
+ "zh-TW": "補全日誌資料夾",
+ "ko-KR": "완성 로그 폴더",
+ "no": "Loggmappe for fullføringer",
+ "it": "Cartella log completamenti",
+ "pt": "Pasta de log de conclusões",
+ "es": "Carpeta de registro de completaciones",
+ "ar": "مجلد سجل الإكمالات",
+ "fr": "Dossier de journalisation des complétions",
+ "tr": "Tamamlama günlüğü klasörü",
+ "de": "Vervollständigungsprotokoll-Ordner",
+ "uk": "Папка логів завершень",
+ "ca": "Carpeta de registre de completacions"
+ },
+ "SCHEMA$LLM$MAX_INPUT_TOKENS$DESCRIPTION": {
+ "en": "Maximum number of input tokens.",
+ "ja": "入力トークンの最大数。",
+ "zh-CN": "最大输入令牌数。",
+ "zh-TW": "最大輸入令牌數。",
+ "ko-KR": "최대 입력 토큰 수.",
+ "no": "Maksimalt antall inndatatokens.",
+ "it": "Numero massimo di token di input.",
+ "pt": "Número máximo de tokens de entrada.",
+ "es": "Número máximo de tokens de entrada.",
+ "ar": "الحد الأقصى لعدد رموز الإدخال.",
+ "fr": "Nombre maximum de jetons d'entrée.",
+ "tr": "Maksimum giriş token sayısı.",
+ "de": "Maximale Anzahl der Eingabe-Token.",
+ "uk": "Максимальна кількість вхідних токенів.",
+ "ca": "Nombre màxim de tokens d'entrada."
+ },
+ "SCHEMA$LLM$MAX_INPUT_TOKENS$LABEL": {
+ "en": "Max Input Tokens",
+ "ja": "最大入力トークン",
+ "zh-CN": "最大输入令牌",
+ "zh-TW": "最大輸入令牌",
+ "ko-KR": "최대 입력 토큰",
+ "no": "Maks inndata-tokens",
+ "it": "Token di input massimi",
+ "pt": "Máximo de tokens de entrada",
+ "es": "Máximo de tokens de entrada",
+ "ar": "الحد الأقصى لرموز الإدخال",
+ "fr": "Jetons d'entrée max",
+ "tr": "Maks giriş token",
+ "de": "Max. Eingabe-Token",
+ "uk": "Макс. вхідних токенів",
+ "ca": "Màxim de tokens d'entrada"
+ },
+ "SCHEMA$LLM$MAX_MESSAGE_CHARS$DESCRIPTION": {
+ "en": "Approximate maximum characters in each event/content sent to the LLM.",
+ "ja": "LLMに送信される各イベント/コンテンツのおおよその最大文字数。",
+ "zh-CN": "发送到LLM的每个事件/内容的大致最大字符数。",
+ "zh-TW": "發送到LLM的每個事件/內容的大致最大字元數。",
+ "ko-KR": "LLM에 전송되는 각 이벤트/콘텐츠의 대략적인 최대 문자 수.",
+ "no": "Omtrentlig maksimalt antall tegn i hver hendelse/innhold sendt til LLM.",
+ "it": "Numero massimo approssimativo di caratteri in ogni evento/contenuto inviato al LLM.",
+ "pt": "Número máximo aproximado de caracteres em cada evento/conteúdo enviado ao LLM.",
+ "es": "Número máximo aproximado de caracteres en cada evento/contenido enviado al LLM.",
+ "ar": "الحد الأقصى التقريبي للأحرف في كل حدث/محتوى يُرسل إلى LLM.",
+ "fr": "Nombre maximum approximatif de caractères dans chaque événement/contenu envoyé au LLM.",
+ "tr": "LLM'e gönderilen her olay/içerikteki yaklaşık maksimum karakter sayısı.",
+ "de": "Ungefähre maximale Zeichenanzahl in jedem Ereignis/Inhalt, das an das LLM gesendet wird.",
+ "uk": "Приблизна максимальна кількість символів у кожній події/вмісті, що надсилається до LLM.",
+ "ca": "Nombre màxim aproximat de caràcters en cada event/contingut enviat a l'LLM."
+ },
+ "SCHEMA$LLM$MAX_MESSAGE_CHARS$LABEL": {
+ "en": "Max Message Chars",
+ "ja": "最大メッセージ文字数",
+ "zh-CN": "最大消息字符数",
+ "zh-TW": "最大訊息字元數",
+ "ko-KR": "최대 메시지 문자 수",
+ "no": "Maks meldingstegn",
+ "it": "Caratteri messaggio massimi",
+ "pt": "Máximo de caracteres de mensagem",
+ "es": "Máximo de caracteres de mensaje",
+ "ar": "الحد الأقصى لأحرف الرسالة",
+ "fr": "Caractères de message max",
+ "tr": "Maks mesaj karakteri",
+ "de": "Max. Nachrichtenzeichen",
+ "uk": "Макс. символів повідомлення",
+ "ca": "Màxim de caràcters de missatge"
+ },
+ "SCHEMA$LLM$MAX_OUTPUT_TOKENS$DESCRIPTION": {
+ "en": "Maximum number of output tokens the model may generate.",
+ "ja": "モデルが生成できる出力トークンの最大数。",
+ "zh-CN": "模型可能生成的最大输出令牌数。",
+ "zh-TW": "模型可能生成的最大輸出令牌數。",
+ "ko-KR": "모델이 생성할 수 있는 최대 출력 토큰 수.",
+ "no": "Maksimalt antall utdatatokens modellen kan generere.",
+ "it": "Numero massimo di token di output che il modello può generare.",
+ "pt": "Número máximo de tokens de saída que o modelo pode gerar.",
+ "es": "Número máximo de tokens de salida que el modelo puede generar.",
+ "ar": "الحد الأقصى لعدد رموز الإخراج التي يمكن للنموذج توليدها.",
+ "fr": "Nombre maximum de jetons de sortie que le modèle peut générer.",
+ "tr": "Modelin üretebileceği maksimum çıkış token sayısı.",
+ "de": "Maximale Anzahl der Ausgabe-Token, die das Modell generieren kann.",
+ "uk": "Максимальна кількість вихідних токенів, які може згенерувати модель.",
+ "ca": "Nombre màxim de tokens de sortida que el model pot generar."
+ },
+ "SCHEMA$LLM$MAX_OUTPUT_TOKENS$LABEL": {
+ "en": "Max Output Tokens",
+ "ja": "最大出力トークン",
+ "zh-CN": "最大输出令牌",
+ "zh-TW": "最大輸出令牌",
+ "ko-KR": "최대 출력 토큰",
+ "no": "Maks utdata-tokens",
+ "it": "Token di output massimi",
+ "pt": "Máximo de tokens de saída",
+ "es": "Máximo de tokens de salida",
+ "ar": "الحد الأقصى لرموز الإخراج",
+ "fr": "Jetons de sortie max",
+ "tr": "Maks çıkış token",
+ "de": "Max. Ausgabe-Token",
+ "uk": "Макс. вихідних токенів",
+ "ca": "Màxim de tokens de sortida"
+ },
+ "SCHEMA$LLM$MODEL$DESCRIPTION": {
+ "en": "Model name.",
+ "ja": "モデル名。",
+ "zh-CN": "模型名称。",
+ "zh-TW": "模型名稱。",
+ "ko-KR": "모델 이름입니다.",
+ "no": "Modellnavn.",
+ "it": "Nome del modello.",
+ "pt": "Nome do modelo.",
+ "es": "Nombre del modelo.",
+ "ar": "اسم النموذج.",
+ "fr": "Nom du modèle.",
+ "tr": "Model adı.",
+ "de": "Modellname.",
+ "uk": "Назва моделі.",
+ "ca": "Nom del model."
+ },
+ "SCHEMA$LLM$MODEL$LABEL": {
+ "en": "Model",
+ "ja": "モデル",
+ "zh-CN": "模型",
+ "zh-TW": "模型",
+ "ko-KR": "모델",
+ "no": "Modell",
+ "it": "Modello",
+ "pt": "Modelo",
+ "es": "Modelo",
+ "ar": "النموذج",
+ "fr": "Modèle",
+ "tr": "Model",
+ "de": "Modell",
+ "uk": "Модель",
+ "ca": "Model"
+ },
+ "SCHEMA$LLM$MODEL_CANONICAL_NAME$DESCRIPTION": {
+ "en": "Canonical model name for feature registry lookups.",
+ "ja": "機能レジストリ検索用の正規モデル名。",
+ "zh-CN": "用于功能注册表查找的规范模型名称。",
+ "zh-TW": "用於功能註冊表查找的規範模型名稱。",
+ "ko-KR": "기능 레지스트리 조회를 위한 정식 모델 이름입니다.",
+ "no": "Kanonisk modellnavn for funksjonsregistersøk.",
+ "it": "Nome canonico del modello per la ricerca nel registro delle funzionalità.",
+ "pt": "Nome canônico do modelo para pesquisas no registro de recursos.",
+ "es": "Nombre canónico del modelo para búsquedas en el registro de funciones.",
+ "ar": "الاسم القانوني للنموذج للبحث في سجل الميزات.",
+ "fr": "Nom canonique du modèle pour les recherches dans le registre des fonctionnalités.",
+ "tr": "Özellik kaydı aramaları için kanonik model adı.",
+ "de": "Kanonischer Modellname für Feature-Registry-Suchen.",
+ "uk": "Канонічна назва моделі для пошуку в реєстрі функцій.",
+ "ca": "Nom canònic del model per a cerques al registre de funcionalitats."
+ },
+ "SCHEMA$LLM$MODEL_CANONICAL_NAME$LABEL": {
+ "en": "Model Canonical Name",
+ "ja": "モデル正規名",
+ "zh-CN": "模型规范名称",
+ "zh-TW": "模型規範名稱",
+ "ko-KR": "모델 정식 이름",
+ "no": "Kanonisk modellnavn",
+ "it": "Nome canonico del modello",
+ "pt": "Nome canônico do modelo",
+ "es": "Nombre canónico del modelo",
+ "ar": "الاسم القانوني للنموذج",
+ "fr": "Nom canonique du modèle",
+ "tr": "Model Kanonik Adı",
+ "de": "Kanonischer Modellname",
+ "uk": "Канонічна назва моделі",
+ "ca": "Nom canònic del model"
+ },
+ "SCHEMA$LLM$MODIFY_PARAMS$DESCRIPTION": {
+ "en": "Allow LiteLLM to modify parameters.",
+ "ja": "LiteLLMがパラメータを変更することを許可します。",
+ "zh-CN": "允许LiteLLM修改参数。",
+ "zh-TW": "允許LiteLLM修改參數。",
+ "ko-KR": "LiteLLM이 파라미터를 수정하도록 허용합니다.",
+ "no": "Tillat LiteLLM å endre parametere.",
+ "it": "Consenti a LiteLLM di modificare i parametri.",
+ "pt": "Permitir que o LiteLLM modifique parâmetros.",
+ "es": "Permitir que LiteLLM modifique parámetros.",
+ "ar": "السماح لـ LiteLLM بتعديل المعلمات.",
+ "fr": "Permettre à LiteLLM de modifier les paramètres.",
+ "tr": "LiteLLM'in parametreleri değiştirmesine izin verin.",
+ "de": "LiteLLM erlauben, Parameter zu ändern.",
+ "uk": "Дозволити LiteLLM змінювати параметри.",
+ "ca": "Permetre que LiteLLM modifiqui paràmetres."
+ },
+ "SCHEMA$LLM$MODIFY_PARAMS$LABEL": {
+ "en": "Modify Params",
+ "ja": "パラメータ変更",
+ "zh-CN": "修改参数",
+ "zh-TW": "修改參數",
+ "ko-KR": "파라미터 수정",
+ "no": "Endre parametere",
+ "it": "Modifica parametri",
+ "pt": "Modificar parâmetros",
+ "es": "Modificar parámetros",
+ "ar": "تعديل المعلمات",
+ "fr": "Modifier les paramètres",
+ "tr": "Parametreleri Değiştir",
+ "de": "Parameter ändern",
+ "uk": "Змінити параметри",
+ "ca": "Modificar paràmetres"
+ },
+ "SCHEMA$LLM$NATIVE_TOOL_CALLING$DESCRIPTION": {
+ "en": "Use native tool calling.",
+ "ja": "ネイティブツール呼び出しを使用します。",
+ "zh-CN": "使用原生工具调用。",
+ "zh-TW": "使用原生工具調用。",
+ "ko-KR": "네이티브 도구 호출을 사용합니다.",
+ "no": "Bruk innebygd verktøykalling.",
+ "it": "Usa la chiamata strumenti nativa.",
+ "pt": "Usar chamada de ferramenta nativa.",
+ "es": "Usar llamada de herramientas nativa.",
+ "ar": "استخدام استدعاء الأدوات الأصلي.",
+ "fr": "Utiliser l'appel d'outils natif.",
+ "tr": "Yerel araç çağırmayı kullanın.",
+ "de": "Native Tool-Aufrufe verwenden.",
+ "uk": "Використовувати нативний виклик інструментів.",
+ "ca": "Utilitzar crida d'eines nativa."
+ },
+ "SCHEMA$LLM$NATIVE_TOOL_CALLING$LABEL": {
+ "en": "Native Tool Calling",
+ "ja": "ネイティブツール呼び出し",
+ "zh-CN": "原生工具调用",
+ "zh-TW": "原生工具調用",
+ "ko-KR": "네이티브 도구 호출",
+ "no": "Innebygd verktøykalling",
+ "it": "Chiamata strumenti nativa",
+ "pt": "Chamada de ferramenta nativa",
+ "es": "Llamada de herramientas nativa",
+ "ar": "استدعاء الأدوات الأصلي",
+ "fr": "Appel d'outils natif",
+ "tr": "Yerel Araç Çağırma",
+ "de": "Native Tool-Aufrufe",
+ "uk": "Нативний виклик інструментів",
+ "ca": "Crida d'eines nativa"
+ },
+ "SCHEMA$LLM$NUM_RETRIES$DESCRIPTION": {
+ "en": "Number of retry attempts for failed requests.",
+ "ja": "失敗したリクエストのリトライ試行回数。",
+ "zh-CN": "失败请求的重试次数。",
+ "zh-TW": "失敗請求的重試次數。",
+ "ko-KR": "실패한 요청에 대한 재시도 횟수입니다.",
+ "no": "Antall gjenforsøk for mislykkede forespørsler.",
+ "it": "Numero di tentativi per le richieste fallite.",
+ "pt": "Número de tentativas para solicitações com falha.",
+ "es": "Número de reintentos para solicitudes fallidas.",
+ "ar": "عدد محاولات إعادة المحاولة للطلبات الفاشلة.",
+ "fr": "Nombre de tentatives pour les requêtes échouées.",
+ "tr": "Başarısız istekler için yeniden deneme sayısı.",
+ "de": "Anzahl der Wiederholungsversuche bei fehlgeschlagenen Anfragen.",
+ "uk": "Кількість повторних спроб для невдалих запитів.",
+ "ca": "Nombre de reintents per a sol·licituds fallides."
+ },
+ "SCHEMA$LLM$NUM_RETRIES$LABEL": {
+ "en": "Number of Retries",
+ "ja": "リトライ回数",
+ "zh-CN": "重试次数",
+ "zh-TW": "重試次數",
+ "ko-KR": "재시도 횟수",
+ "no": "Antall gjenforsøk",
+ "it": "Numero di tentativi",
+ "pt": "Número de tentativas",
+ "es": "Número de reintentos",
+ "ar": "عدد مرات إعادة المحاولة",
+ "fr": "Nombre de tentatives",
+ "tr": "Yeniden Deneme Sayısı",
+ "de": "Anzahl der Wiederholungen",
+ "uk": "Кількість повторних спроб",
+ "ca": "Nombre de reintents"
+ },
+ "SCHEMA$LLM$OLLAMA_BASE_URL$DESCRIPTION": {
+ "en": "Base URL for Ollama service.",
+ "ja": "OllamaサービスのベースURL。",
+ "zh-CN": "Ollama服务的基础URL。",
+ "zh-TW": "Ollama服務的基礎URL。",
+ "ko-KR": "Ollama 서비스의 기본 URL입니다.",
+ "no": "Basis-URL for Ollama-tjenesten.",
+ "it": "URL di base per il servizio Ollama.",
+ "pt": "URL base para o serviço Ollama.",
+ "es": "URL base para el servicio Ollama.",
+ "ar": "عنوان URL الأساسي لخدمة Ollama.",
+ "fr": "URL de base pour le service Ollama.",
+ "tr": "Ollama hizmeti için temel URL.",
+ "de": "Basis-URL für den Ollama-Dienst.",
+ "uk": "Базова URL-адреса для сервісу Ollama.",
+ "ca": "URL base per al servei Ollama."
+ },
+ "SCHEMA$LLM$OLLAMA_BASE_URL$LABEL": {
+ "en": "Ollama Base URL",
+ "ja": "OllamaベースURL",
+ "zh-CN": "Ollama基础URL",
+ "zh-TW": "Ollama基礎URL",
+ "ko-KR": "Ollama 기본 URL",
+ "no": "Ollama basis-URL",
+ "it": "URL di base Ollama",
+ "pt": "URL base do Ollama",
+ "es": "URL base de Ollama",
+ "ar": "عنوان URL الأساسي لـ Ollama",
+ "fr": "URL de base Ollama",
+ "tr": "Ollama Temel URL",
+ "de": "Ollama-Basis-URL",
+ "uk": "Базова URL-адреса Ollama",
+ "ca": "URL base d'Ollama"
+ },
+ "SCHEMA$LLM$OPENROUTER_APP_NAME$DESCRIPTION": {
+ "en": "OpenRouter application name.",
+ "ja": "OpenRouterアプリケーション名。",
+ "zh-CN": "OpenRouter应用程序名称。",
+ "zh-TW": "OpenRouter應用程式名稱。",
+ "ko-KR": "OpenRouter 애플리케이션 이름입니다.",
+ "no": "OpenRouter applikasjonsnavn.",
+ "it": "Nome dell'applicazione OpenRouter.",
+ "pt": "Nome do aplicativo OpenRouter.",
+ "es": "Nombre de la aplicación OpenRouter.",
+ "ar": "اسم تطبيق OpenRouter.",
+ "fr": "Nom de l'application OpenRouter.",
+ "tr": "OpenRouter uygulama adı.",
+ "de": "OpenRouter-Anwendungsname.",
+ "uk": "Назва програми OpenRouter.",
+ "ca": "Nom de l'aplicació OpenRouter."
+ },
+ "SCHEMA$LLM$OPENROUTER_APP_NAME$LABEL": {
+ "en": "OpenRouter App Name",
+ "ja": "OpenRouterアプリ名",
+ "zh-CN": "OpenRouter应用名称",
+ "zh-TW": "OpenRouter應用程式名稱",
+ "ko-KR": "OpenRouter 앱 이름",
+ "no": "OpenRouter appnavn",
+ "it": "Nome app OpenRouter",
+ "pt": "Nome do aplicativo OpenRouter",
+ "es": "Nombre de la aplicación OpenRouter",
+ "ar": "اسم تطبيق OpenRouter",
+ "fr": "Nom de l'application OpenRouter",
+ "tr": "OpenRouter Uygulama Adı",
+ "de": "OpenRouter-App-Name",
+ "uk": "Назва програми OpenRouter",
+ "ca": "Nom de l'aplicació OpenRouter"
+ },
+ "SCHEMA$LLM$OPENROUTER_SITE_URL$DESCRIPTION": {
+ "en": "OpenRouter site URL.",
+ "ja": "OpenRouterサイトURL。",
+ "zh-CN": "OpenRouter站点URL。",
+ "zh-TW": "OpenRouter網站URL。",
+ "ko-KR": "OpenRouter 사이트 URL입니다.",
+ "no": "OpenRouter nettsted-URL.",
+ "it": "URL del sito OpenRouter.",
+ "pt": "URL do site OpenRouter.",
+ "es": "URL del sitio OpenRouter.",
+ "ar": "عنوان URL لموقع OpenRouter.",
+ "fr": "URL du site OpenRouter.",
+ "tr": "OpenRouter site URL'si.",
+ "de": "OpenRouter-Website-URL.",
+ "uk": "URL-адреса сайту OpenRouter.",
+ "ca": "URL del lloc OpenRouter."
+ },
+ "SCHEMA$LLM$OPENROUTER_SITE_URL$LABEL": {
+ "en": "OpenRouter Site URL",
+ "ja": "OpenRouterサイトURL",
+ "zh-CN": "OpenRouter站点URL",
+ "zh-TW": "OpenRouter網站URL",
+ "ko-KR": "OpenRouter 사이트 URL",
+ "no": "OpenRouter nettsted-URL",
+ "it": "URL del sito OpenRouter",
+ "pt": "URL do site OpenRouter",
+ "es": "URL del sitio OpenRouter",
+ "ar": "عنوان URL لموقع OpenRouter",
+ "fr": "URL du site OpenRouter",
+ "tr": "OpenRouter Site URL'si",
+ "de": "OpenRouter-Website-URL",
+ "uk": "URL-адреса сайту OpenRouter",
+ "ca": "URL del lloc OpenRouter"
+ },
+ "SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$DESCRIPTION": {
+ "en": "Cost per output token for logging purposes.",
+ "ja": "ログ記録用のトークンあたりの出力コスト。",
+ "zh-CN": "用于日志记录的每个输出令牌的成本。",
+ "zh-TW": "用於日誌記錄的每個輸出權杖的成本。",
+ "ko-KR": "로깅 목적의 출력 토큰당 비용입니다.",
+ "no": "Kostnad per utdatatoken for loggingsformål.",
+ "it": "Costo per token di output a scopo di registrazione.",
+ "pt": "Custo por token de saída para fins de registro.",
+ "es": "Costo por token de salida para fines de registro.",
+ "ar": "تكلفة كل رمز إخراج لأغراض التسجيل.",
+ "fr": "Coût par jeton de sortie à des fins de journalisation.",
+ "tr": "Günlük tutma amaçlı çıkış token başına maliyet.",
+ "de": "Kosten pro Ausgabe-Token für Protokollierungszwecke.",
+ "uk": "Вартість за токен виведення для цілей логування.",
+ "ca": "Cost per token de sortida per a finalitats de registre."
+ },
+ "SCHEMA$LLM$OUTPUT_COST_PER_TOKEN$LABEL": {
+ "en": "Output Cost Per Token",
+ "ja": "トークンあたりの出力コスト",
+ "zh-CN": "每个令牌的输出成本",
+ "zh-TW": "每個權杖的輸出成本",
+ "ko-KR": "토큰당 출력 비용",
+ "no": "Utdatakostnad per token",
+ "it": "Costo di output per token",
+ "pt": "Custo de saída por token",
+ "es": "Costo de salida por token",
+ "ar": "تكلفة الإخراج لكل رمز",
+ "fr": "Coût de sortie par jeton",
+ "tr": "Token Başına Çıkış Maliyeti",
+ "de": "Ausgabekosten pro Token",
+ "uk": "Вартість виведення за токен",
+ "ca": "Cost de sortida per token"
+ },
+ "SCHEMA$LLM$PROMPT_CACHE_RETENTION$DESCRIPTION": {
+ "en": "Retention policy for prompt cache.",
+ "ja": "プロンプトキャッシュの保持ポリシー。",
+ "zh-CN": "提示缓存的保留策略。",
+ "zh-TW": "提示快取的保留策略。",
+ "ko-KR": "프롬프트 캐시의 유지 정책입니다.",
+ "no": "Oppbevaringspolicy for hurtigbuffer.",
+ "it": "Politica di conservazione per la cache del prompt.",
+ "pt": "Política de retenção para cache de prompt.",
+ "es": "Política de retención para caché de prompt.",
+ "ar": "سياسة الاحتفاظ بذاكرة التخزين المؤقت للمطالبات.",
+ "fr": "Politique de rétention pour le cache de prompt.",
+ "tr": "Prompt önbelleği için saklama politikası.",
+ "de": "Aufbewahrungsrichtlinie für Prompt-Cache.",
+ "uk": "Політика збереження для кешу промптів.",
+ "ca": "Política de retenció per a la memòria cau del prompt."
+ },
+ "SCHEMA$LLM$PROMPT_CACHE_RETENTION$LABEL": {
+ "en": "Prompt Cache Retention",
+ "ja": "プロンプトキャッシュ保持",
+ "zh-CN": "提示缓存保留",
+ "zh-TW": "提示快取保留",
+ "ko-KR": "프롬프트 캐시 유지",
+ "no": "Hurtigbufferlagring",
+ "it": "Conservazione cache prompt",
+ "pt": "Retenção de cache de prompt",
+ "es": "Retención de caché de prompt",
+ "ar": "الاحتفاظ بذاكرة التخزين المؤقت للمطالبات",
+ "fr": "Rétention du cache de prompt",
+ "tr": "Prompt Önbellek Saklama",
+ "de": "Prompt-Cache-Aufbewahrung",
+ "uk": "Збереження кешу промптів",
+ "ca": "Retenció de memòria cau del prompt"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$CHOICE$HIGH": {
+ "en": "High",
+ "ja": "高",
+ "zh-CN": "高",
+ "zh-TW": "高",
+ "ko-KR": "높음",
+ "no": "Høy",
+ "it": "Alto",
+ "pt": "Alto",
+ "es": "Alto",
+ "ar": "عالي",
+ "fr": "Élevé",
+ "tr": "Yüksek",
+ "de": "Hoch",
+ "uk": "Високий",
+ "ca": "Alt"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$CHOICE$LOW": {
+ "en": "Low",
+ "ja": "低",
+ "zh-CN": "低",
+ "zh-TW": "低",
+ "ko-KR": "낮음",
+ "no": "Lav",
+ "it": "Basso",
+ "pt": "Baixo",
+ "es": "Bajo",
+ "ar": "منخفض",
+ "fr": "Bas",
+ "tr": "Düşük",
+ "de": "Niedrig",
+ "uk": "Низький",
+ "ca": "Baix"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$CHOICE$MEDIUM": {
+ "en": "Medium",
+ "ja": "中",
+ "zh-CN": "中",
+ "zh-TW": "中",
+ "ko-KR": "중간",
+ "no": "Middels",
+ "it": "Medio",
+ "pt": "Médio",
+ "es": "Medio",
+ "ar": "متوسط",
+ "fr": "Moyen",
+ "tr": "Orta",
+ "de": "Mittel",
+ "uk": "Середній",
+ "ca": "Mitjà"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$CHOICE$NONE": {
+ "en": "None",
+ "ja": "なし",
+ "zh-CN": "无",
+ "zh-TW": "無",
+ "ko-KR": "없음",
+ "no": "Ingen",
+ "it": "Nessuno",
+ "pt": "Nenhum",
+ "es": "Ninguno",
+ "ar": "لا شيء",
+ "fr": "Aucun",
+ "tr": "Yok",
+ "de": "Keine",
+ "uk": "Немає",
+ "ca": "Cap"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$CHOICE$XHIGH": {
+ "en": "Extra High",
+ "ja": "最高",
+ "zh-CN": "超高",
+ "zh-TW": "超高",
+ "ko-KR": "최고",
+ "no": "Ekstra høy",
+ "it": "Extra alto",
+ "pt": "Extra alto",
+ "es": "Extra alto",
+ "ar": "عالي جداً",
+ "fr": "Très élevé",
+ "tr": "Çok yüksek",
+ "de": "Sehr hoch",
+ "uk": "Дуже високий",
+ "ca": "Extra alt"
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$DESCRIPTION": {
+ "en": "The effort to put into reasoning (low, medium, high, xhigh, or none).",
+ "ja": "推論に費やす労力(低、中、高、最高、またはなし)。",
+ "zh-CN": "推理投入的努力程度(低、中、高、超高或无)。",
+ "zh-TW": "推理投入的努力程度(低、中、高、超高或無)。",
+ "ko-KR": "추론에 투입할 노력 수준 (낮음, 중간, 높음, 최고, 또는 없음).",
+ "no": "Innsatsen å legge i resonnering (lav, middels, høy, ekstra høy, eller ingen).",
+ "it": "L'impegno da dedicare al ragionamento (basso, medio, alto, extra alto o nessuno).",
+ "pt": "O esforço a dedicar ao raciocínio (baixo, médio, alto, extra alto ou nenhum).",
+ "es": "El esfuerzo a dedicar al razonamiento (bajo, medio, alto, extra alto o ninguno).",
+ "ar": "مستوى الجهد في الاستدلال (منخفض، متوسط، عالي، عالي جداً، أو لا شيء).",
+ "fr": "L'effort à consacrer au raisonnement (bas, moyen, élevé, très élevé ou aucun).",
+ "tr": "Akıl yürütmeye harcanacak çaba (düşük, orta, yüksek, çok yüksek veya yok).",
+ "de": "Der Aufwand für die Schlussfolgerung (niedrig, mittel, hoch, sehr hoch oder keine).",
+ "uk": "Рівень зусиль для міркування (низький, середній, високий, дуже високий або немає).",
+ "ca": "L'esforç a dedicar al raonament (baix, mitjà, alt, extra alt o cap)."
+ },
+ "SCHEMA$LLM$REASONING_EFFORT$LABEL": {
+ "en": "Reasoning Effort",
+ "ja": "推論努力度",
+ "zh-CN": "推理力度",
+ "zh-TW": "推理力度",
+ "ko-KR": "추론 노력",
+ "no": "Resonneringsinnsats",
+ "it": "Sforzo di ragionamento",
+ "pt": "Esforço de raciocínio",
+ "es": "Esfuerzo de razonamiento",
+ "ar": "جهد الاستدلال",
+ "fr": "Effort de raisonnement",
+ "tr": "Akıl Yürütme Çabası",
+ "de": "Reasoning-Aufwand",
+ "uk": "Зусилля міркування",
+ "ca": "Esforç de raonament"
+ },
+ "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$AUTO": {
+ "en": "Auto",
+ "ja": "自動",
+ "zh-CN": "自动",
+ "zh-TW": "自動",
+ "ko-KR": "자동",
+ "no": "Auto",
+ "it": "Auto",
+ "pt": "Automático",
+ "es": "Automático",
+ "ar": "تلقائي",
+ "fr": "Auto",
+ "tr": "Otomatik",
+ "de": "Auto",
+ "uk": "Авто",
+ "ca": "Automàtic"
+ },
+ "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$CONCISE": {
+ "en": "Concise",
+ "ja": "簡潔",
+ "zh-CN": "简洁",
+ "zh-TW": "簡潔",
+ "ko-KR": "간결",
+ "no": "Kortfattet",
+ "it": "Conciso",
+ "pt": "Conciso",
+ "es": "Conciso",
+ "ar": "موجز",
+ "fr": "Concis",
+ "tr": "Özlü",
+ "de": "Prägnant",
+ "uk": "Стислий",
+ "ca": "Concís"
+ },
+ "SCHEMA$LLM$REASONING_SUMMARY$CHOICE$DETAILED": {
+ "en": "Detailed",
+ "ja": "詳細",
+ "zh-CN": "详细",
+ "zh-TW": "詳細",
+ "ko-KR": "상세",
+ "no": "Detaljert",
+ "it": "Dettagliato",
+ "pt": "Detalhado",
+ "es": "Detallado",
+ "ar": "مفصل",
+ "fr": "Détaillé",
+ "tr": "Ayrıntılı",
+ "de": "Detailliert",
+ "uk": "Детальний",
+ "ca": "Detallat"
+ },
+ "SCHEMA$LLM$REASONING_SUMMARY$DESCRIPTION": {
+ "en": "Level of detail for reasoning summaries (auto, concise, or detailed).",
+ "ja": "推論サマリーの詳細レベル(自動、簡潔、または詳細)。",
+ "zh-CN": "推理摘要的详细程度(自动、简洁或详细)。",
+ "zh-TW": "推理摘要的詳細程度(自動、簡潔或詳細)。",
+ "ko-KR": "추론 요약의 상세 수준 (자동, 간결, 또는 상세).",
+ "no": "Detaljnivå for resonneringssammendrag (auto, kortfattet eller detaljert).",
+ "it": "Livello di dettaglio per i riassunti di ragionamento (auto, conciso o dettagliato).",
+ "pt": "Nível de detalhe para resumos de raciocínio (automático, conciso ou detalhado).",
+ "es": "Nivel de detalle para los resúmenes de razonamiento (automático, conciso o detallado).",
+ "ar": "مستوى التفصيل لملخصات الاستدلال (تلقائي، موجز، أو مفصل).",
+ "fr": "Niveau de détail pour les résumés de raisonnement (auto, concis ou détaillé).",
+ "tr": "Akıl yürütme özetleri için ayrıntı düzeyi (otomatik, özlü veya ayrıntılı).",
+ "de": "Detaillierungsgrad für Schlussfolgerungszusammenfassungen (auto, prägnant oder detailliert).",
+ "uk": "Рівень деталізації для підсумків міркування (авто, стислий або детальний).",
+ "ca": "Nivell de detall per als resums de raonament (automàtic, concís o detallat)."
+ },
+ "SCHEMA$LLM$REASONING_SUMMARY$LABEL": {
+ "en": "Reasoning Summary",
+ "ja": "推論サマリー",
+ "zh-CN": "推理摘要",
+ "zh-TW": "推理摘要",
+ "ko-KR": "추론 요약",
+ "no": "Resonneringssammendrag",
+ "it": "Riassunto ragionamento",
+ "pt": "Resumo de raciocínio",
+ "es": "Resumen de razonamiento",
+ "ar": "ملخص الاستدلال",
+ "fr": "Résumé de raisonnement",
+ "tr": "Akıl yürütme özeti",
+ "de": "Schlussfolgerungszusammenfassung",
+ "uk": "Підсумок міркування",
+ "ca": "Resum de raonament"
+ },
+ "SCHEMA$LLM$RETRY_MAX_WAIT$DESCRIPTION": {
+ "en": "Maximum wait time between retries in seconds.",
+ "ja": "リトライ間の最大待機時間(秒)。",
+ "zh-CN": "重试之间的最大等待时间(秒)。",
+ "zh-TW": "重試之間的最大等待時間(秒)。",
+ "ko-KR": "재시도 간 최대 대기 시간(초)입니다.",
+ "no": "Maksimum ventetid mellom gjenforsøk i sekunder.",
+ "it": "Tempo massimo di attesa tra i tentativi in secondi.",
+ "pt": "Tempo máximo de espera entre tentativas em segundos.",
+ "es": "Tiempo máximo de espera entre reintentos en segundos.",
+ "ar": "الحد الأقصى لوقت الانتظار بين محاولات إعادة المحاولة بالثواني.",
+ "fr": "Temps d'attente maximum entre les tentatives en secondes.",
+ "tr": "Yeniden denemeler arasında maksimum bekleme süresi (saniye).",
+ "de": "Maximale Wartezeit zwischen Wiederholungen in Sekunden.",
+ "uk": "Максимальний час очікування між повторними спробами в секундах.",
+ "ca": "Temps màxim d'espera entre reintents en segons."
+ },
+ "SCHEMA$LLM$RETRY_MAX_WAIT$LABEL": {
+ "en": "Retry Max Wait",
+ "ja": "リトライ最大待機時間",
+ "zh-CN": "重试最大等待时间",
+ "zh-TW": "重試最大等待時間",
+ "ko-KR": "재시도 최대 대기",
+ "no": "Maksimum ventetid for gjenforsøk",
+ "it": "Attesa massima tentativi",
+ "pt": "Espera máxima de tentativa",
+ "es": "Espera máxima de reintento",
+ "ar": "الحد الأقصى لانتظار إعادة المحاولة",
+ "fr": "Attente maximale de tentative",
+ "tr": "Maksimum Yeniden Deneme Bekleme",
+ "de": "Maximale Wartezeit für Wiederholung",
+ "uk": "Максимальний час очікування повтору",
+ "ca": "Espera màxima de reintent"
+ },
+ "SCHEMA$LLM$RETRY_MIN_WAIT$DESCRIPTION": {
+ "en": "Minimum wait time between retries in seconds.",
+ "ja": "リトライ間の最小待機時間(秒)。",
+ "zh-CN": "重试之间的最小等待时间(秒)。",
+ "zh-TW": "重試之間的最小等待時間(秒)。",
+ "ko-KR": "재시도 간 최소 대기 시간(초)입니다.",
+ "no": "Minimum ventetid mellom gjenforsøk i sekunder.",
+ "it": "Tempo minimo di attesa tra i tentativi in secondi.",
+ "pt": "Tempo mínimo de espera entre tentativas em segundos.",
+ "es": "Tiempo mínimo de espera entre reintentos en segundos.",
+ "ar": "الحد الأدنى لوقت الانتظار بين محاولات إعادة المحاولة بالثواني.",
+ "fr": "Temps d'attente minimum entre les tentatives en secondes.",
+ "tr": "Yeniden denemeler arasında minimum bekleme süresi (saniye).",
+ "de": "Minimale Wartezeit zwischen Wiederholungen in Sekunden.",
+ "uk": "Мінімальний час очікування між повторними спробами в секундах.",
+ "ca": "Temps mínim d'espera entre reintents en segons."
+ },
+ "SCHEMA$LLM$RETRY_MIN_WAIT$LABEL": {
+ "en": "Retry Min Wait",
+ "ja": "リトライ最小待機時間",
+ "zh-CN": "重试最小等待时间",
+ "zh-TW": "重試最小等待時間",
+ "ko-KR": "재시도 최소 대기",
+ "no": "Minimum ventetid for gjenforsøk",
+ "it": "Attesa minima tentativi",
+ "pt": "Espera mínima de tentativa",
+ "es": "Espera mínima de reintento",
+ "ar": "الحد الأدنى لانتظار إعادة المحاولة",
+ "fr": "Attente minimale de tentative",
+ "tr": "Minimum Yeniden Deneme Bekleme",
+ "de": "Minimale Wartezeit für Wiederholung",
+ "uk": "Мінімальний час очікування повтору",
+ "ca": "Espera mínima de reintent"
+ },
+ "SCHEMA$LLM$RETRY_MULTIPLIER$DESCRIPTION": {
+ "en": "Multiplier for exponential backoff between retries.",
+ "ja": "リトライ間の指数バックオフの乗数。",
+ "zh-CN": "重试之间指数退避的乘数。",
+ "zh-TW": "重試之間指數退避的乘數。",
+ "ko-KR": "재시도 간 지수 백오프의 승수입니다.",
+ "no": "Multiplikator for eksponentiell tilbaketrekning mellom gjenforsøk.",
+ "it": "Moltiplicatore per il backoff esponenziale tra i tentativi.",
+ "pt": "Multiplicador para recuo exponencial entre tentativas.",
+ "es": "Multiplicador para el retroceso exponencial entre reintentos.",
+ "ar": "مضاعف التراجع الأسي بين محاولات إعادة المحاولة.",
+ "fr": "Multiplicateur pour le recul exponentiel entre les tentatives.",
+ "tr": "Yeniden denemeler arasında üstel geri çekilme çarpanı.",
+ "de": "Multiplikator für exponentiellen Rückzug zwischen Wiederholungen.",
+ "uk": "Множник для експоненційної затримки між повторними спробами.",
+ "ca": "Multiplicador per a la retirada exponencial entre reintents."
+ },
+ "SCHEMA$LLM$RETRY_MULTIPLIER$LABEL": {
+ "en": "Retry Multiplier",
+ "ja": "リトライ乗数",
+ "zh-CN": "重试乘数",
+ "zh-TW": "重試乘數",
+ "ko-KR": "재시도 승수",
+ "no": "Gjenforsøksmultiplikator",
+ "it": "Moltiplicatore tentativi",
+ "pt": "Multiplicador de tentativas",
+ "es": "Multiplicador de reintentos",
+ "ar": "مضاعف إعادة المحاولة",
+ "fr": "Multiplicateur de tentatives",
+ "tr": "Yeniden Deneme Çarpanı",
+ "de": "Wiederholungsmultiplikator",
+ "uk": "Множник повторних спроб",
+ "ca": "Multiplicador de reintents"
+ },
+ "SCHEMA$LLM$SAFETY_SETTINGS$DESCRIPTION": {
+ "en": "Deprecated safety settings.",
+ "ja": "非推奨の安全設定。",
+ "zh-CN": "已弃用的安全设置。",
+ "zh-TW": "已棄用的安全設定。",
+ "ko-KR": "더 이상 사용되지 않는 안전 설정.",
+ "no": "Utdaterte sikkerhetsinnstillinger.",
+ "it": "Impostazioni di sicurezza deprecate.",
+ "pt": "Configurações de segurança obsoletas.",
+ "es": "Configuraciones de seguridad obsoletas.",
+ "ar": "إعدادات أمان قديمة.",
+ "fr": "Paramètres de sécurité obsolètes.",
+ "tr": "Kullanımdan kaldırılmış güvenlik ayarları.",
+ "de": "Veraltete Sicherheitseinstellungen.",
+ "uk": "Застарілі налаштування безпеки.",
+ "ca": "Configuracions de seguretat obsoletes."
+ },
+ "SCHEMA$LLM$SAFETY_SETTINGS$LABEL": {
+ "en": "Safety Settings",
+ "ja": "安全設定",
+ "zh-CN": "安全设置",
+ "zh-TW": "安全設定",
+ "ko-KR": "안전 설정",
+ "no": "Sikkerhetsinnstillinger",
+ "it": "Impostazioni di sicurezza",
+ "pt": "Configurações de segurança",
+ "es": "Configuraciones de seguridad",
+ "ar": "إعدادات الأمان",
+ "fr": "Paramètres de sécurité",
+ "tr": "Güvenlik ayarları",
+ "de": "Sicherheitseinstellungen",
+ "uk": "Налаштування безпеки",
+ "ca": "Configuracions de seguretat"
+ },
+ "SCHEMA$LLM$SECTION_LABEL": {
+ "en": "LLM",
+ "ja": "LLM",
+ "zh-CN": "LLM",
+ "zh-TW": "LLM",
+ "ko-KR": "LLM",
+ "no": "LLM",
+ "it": "LLM",
+ "pt": "LLM",
+ "es": "LLM",
+ "ar": "LLM",
+ "fr": "LLM",
+ "tr": "LLM",
+ "de": "LLM",
+ "uk": "LLM",
+ "ca": "LLM"
+ },
+ "SCHEMA$LLM$SEED$DESCRIPTION": {
+ "en": "Seed for random number generation.",
+ "ja": "乱数生成のシード。",
+ "zh-CN": "随机数生成的种子。",
+ "zh-TW": "隨機數生成的種子。",
+ "ko-KR": "난수 생성을 위한 시드.",
+ "no": "Seed for tilfeldig tallgenerering.",
+ "it": "Seed per la generazione di numeri casuali.",
+ "pt": "Semente para geração de números aleatórios.",
+ "es": "Semilla para la generación de números aleatorios.",
+ "ar": "البذرة لتوليد الأرقام العشوائية.",
+ "fr": "Graine pour la génération de nombres aléatoires.",
+ "tr": "Rastgele sayı üretimi için tohum.",
+ "de": "Seed für die Zufallszahlengenerierung.",
+ "uk": "Seed для генерації випадкових чисел.",
+ "ca": "Llavor per a la generació de nombres aleatoris."
+ },
+ "SCHEMA$LLM$SEED$LABEL": {
+ "en": "Seed",
+ "ja": "シード",
+ "zh-CN": "种子",
+ "zh-TW": "種子",
+ "ko-KR": "시드",
+ "no": "Seed",
+ "it": "Seed",
+ "pt": "Semente",
+ "es": "Semilla",
+ "ar": "البذرة",
+ "fr": "Graine",
+ "tr": "Tohum",
+ "de": "Seed",
+ "uk": "Seed",
+ "ca": "Llavor"
+ },
+ "SCHEMA$LLM$STREAM$DESCRIPTION": {
+ "en": "Enable streaming responses from the LLM.",
+ "ja": "LLMからのストリーミング応答を有効にする。",
+ "zh-CN": "启用来自LLM的流式响应。",
+ "zh-TW": "啟用來自LLM的串流回應。",
+ "ko-KR": "LLM에서 스트리밍 응답을 활성화합니다.",
+ "no": "Aktiver strømming av svar fra LLM.",
+ "it": "Abilita le risposte in streaming dal LLM.",
+ "pt": "Ativar respostas em streaming do LLM.",
+ "es": "Habilitar respuestas en streaming del LLM.",
+ "ar": "تمكين الردود المتدفقة من LLM.",
+ "fr": "Activer les réponses en streaming du LLM.",
+ "tr": "LLM'den akış yanıtlarını etkinleştir.",
+ "de": "Streaming-Antworten vom LLM aktivieren.",
+ "uk": "Увімкнути потокові відповіді від LLM.",
+ "ca": "Activa les respostes en streaming de l'LLM."
+ },
+ "SCHEMA$LLM$STREAM$LABEL": {
+ "en": "Stream",
+ "ja": "ストリーム",
+ "zh-CN": "流式传输",
+ "zh-TW": "串流",
+ "ko-KR": "스트림",
+ "no": "Strøm",
+ "it": "Stream",
+ "pt": "Stream",
+ "es": "Stream",
+ "ar": "بث",
+ "fr": "Stream",
+ "tr": "Akış",
+ "de": "Stream",
+ "uk": "Потік",
+ "ca": "Stream"
+ },
+ "SCHEMA$LLM$TEMPERATURE$DESCRIPTION": {
+ "en": "Controls randomness in model responses. Lower values are more deterministic.",
+ "ja": "モデル応答のランダム性を制御します。値が低いほど確定的になります。",
+ "zh-CN": "控制模型响应的随机性。较低的值更具确定性。",
+ "zh-TW": "控制模型回應的隨機性。較低的值更具確定性。",
+ "ko-KR": "모델 응답의 무작위성을 제어합니다. 낮은 값이 더 결정적입니다.",
+ "no": "Styrer tilfeldighet i modellsvar. Lavere verdier er mer deterministiske.",
+ "it": "Controlla la casualità nelle risposte del modello. Valori più bassi sono più deterministici.",
+ "pt": "Controla a aleatoriedade nas respostas do modelo. Valores mais baixos são mais determinísticos.",
+ "es": "Controla la aleatoriedad en las respuestas del modelo. Los valores más bajos son más deterministas.",
+ "ar": "يتحكم في العشوائية في استجابات النموذج. القيم الأقل أكثر حتمية.",
+ "fr": "Contrôle le caractère aléatoire des réponses du modèle. Les valeurs plus basses sont plus déterministes.",
+ "tr": "Model yanıtlarındaki rastgeleliği kontrol eder. Düşük değerler daha belirleyicidir.",
+ "de": "Steuert die Zufälligkeit in Modellantworten. Niedrigere Werte sind deterministischer.",
+ "uk": "Контролює випадковість у відповідях моделі. Нижчі значення більш детерміновані.",
+ "ca": "Controla l'aleatorietat en les respostes del model. Els valors més baixos són més deterministes."
+ },
+ "SCHEMA$LLM$TEMPERATURE$LABEL": {
+ "en": "Temperature",
+ "ja": "温度",
+ "zh-CN": "温度",
+ "zh-TW": "溫度",
+ "ko-KR": "온도",
+ "no": "Temperatur",
+ "it": "Temperatura",
+ "pt": "Temperatura",
+ "es": "Temperatura",
+ "ar": "درجة الحرارة",
+ "fr": "Température",
+ "tr": "Sıcaklık",
+ "de": "Temperatur",
+ "uk": "Температура",
+ "ca": "Temperatura"
+ },
+ "SCHEMA$LLM$TIMEOUT$DESCRIPTION": {
+ "en": "HTTP timeout in seconds.",
+ "ja": "HTTPタイムアウト(秒)。",
+ "zh-CN": "HTTP超时时间(秒)。",
+ "zh-TW": "HTTP逾時時間(秒)。",
+ "ko-KR": "HTTP 타임아웃(초)입니다.",
+ "no": "HTTP-tidsavbrudd i sekunder.",
+ "it": "Timeout HTTP in secondi.",
+ "pt": "Tempo limite HTTP em segundos.",
+ "es": "Tiempo de espera HTTP en segundos.",
+ "ar": "مهلة HTTP بالثواني.",
+ "fr": "Délai d'attente HTTP en secondes.",
+ "tr": "HTTP zaman aşımı (saniye).",
+ "de": "HTTP-Zeitüberschreitung in Sekunden.",
+ "uk": "HTTP тайм-аут у секундах.",
+ "ca": "Temps d'espera HTTP en segons."
+ },
+ "SCHEMA$LLM$TIMEOUT$LABEL": {
+ "en": "Timeout",
+ "ja": "タイムアウト",
+ "zh-CN": "超时",
+ "zh-TW": "逾時",
+ "ko-KR": "타임아웃",
+ "no": "Tidsavbrudd",
+ "it": "Timeout",
+ "pt": "Tempo limite",
+ "es": "Tiempo de espera",
+ "ar": "مهلة الانتظار",
+ "fr": "Délai d'attente",
+ "tr": "Zaman Aşımı",
+ "de": "Zeitüberschreitung",
+ "uk": "Тайм-аут",
+ "ca": "Temps d'espera"
+ },
+ "SCHEMA$LLM$TOP_K$DESCRIPTION": {
+ "en": "Limits token selection to the K most likely tokens.",
+ "ja": "トークン選択を最も可能性の高いK個のトークンに制限します。",
+ "zh-CN": "将令牌选择限制为最可能的K个令牌。",
+ "zh-TW": "將令牌選擇限制為最可能的K個令牌。",
+ "ko-KR": "토큰 선택을 가장 가능성이 높은 K개의 토큰으로 제한합니다.",
+ "no": "Begrenser tokenvalg til de K mest sannsynlige tokenene.",
+ "it": "Limita la selezione dei token ai K token più probabili.",
+ "pt": "Limita a seleção de tokens aos K tokens mais prováveis.",
+ "es": "Limita la selección de tokens a los K tokens más probables.",
+ "ar": "يحد من اختيار الرموز إلى أكثر K رموز احتمالاً.",
+ "fr": "Limite la sélection de jetons aux K jetons les plus probables.",
+ "tr": "Token seçimini en olası K token ile sınırlar.",
+ "de": "Begrenzt die Token-Auswahl auf die K wahrscheinlichsten Token.",
+ "uk": "Обмежує вибір токенів до K найімовірніших токенів.",
+ "ca": "Limita la selecció de tokens als K tokens més probables."
+ },
+ "SCHEMA$LLM$TOP_K$LABEL": {
+ "en": "Top K",
+ "ja": "Top K",
+ "zh-CN": "Top K",
+ "zh-TW": "Top K",
+ "ko-KR": "Top K",
+ "no": "Top K",
+ "it": "Top K",
+ "pt": "Top K",
+ "es": "Top K",
+ "ar": "Top K",
+ "fr": "Top K",
+ "tr": "Top K",
+ "de": "Top K",
+ "uk": "Top K",
+ "ca": "Top K"
+ },
+ "SCHEMA$LLM$TOP_P$DESCRIPTION": {
+ "en": "Controls nucleus sampling by limiting token selection to the smallest set whose cumulative probability exceeds this value.",
+ "ja": "累積確率がこの値を超える最小セットにトークン選択を制限することで核サンプリングを制御します。",
+ "zh-CN": "通过将令牌选择限制为累积概率超过此值的最小集合来控制核采样。",
+ "zh-TW": "通過將令牌選擇限制為累積概率超過此值的最小集合來控制核採樣。",
+ "ko-KR": "누적 확률이 이 값을 초과하는 가장 작은 집합으로 토큰 선택을 제한하여 핵 샘플링을 제어합니다.",
+ "no": "Styrer kjerneprøvetaking ved å begrense tokenvalg til det minste settet hvis kumulative sannsynlighet overstiger denne verdien.",
+ "it": "Controlla il campionamento del nucleo limitando la selezione dei token al set più piccolo la cui probabilità cumulativa supera questo valore.",
+ "pt": "Controla a amostragem de núcleo limitando a seleção de tokens ao menor conjunto cuja probabilidade cumulativa excede este valor.",
+ "es": "Controla el muestreo de núcleo limitando la selección de tokens al conjunto más pequeño cuya probabilidad acumulativa excede este valor.",
+ "ar": "يتحكم في أخذ العينات النووية عن طريق تحديد اختيار الرموز إلى أصغر مجموعة يتجاوز احتمالها التراكمي هذه القيمة.",
+ "fr": "Contrôle l'échantillonnage du noyau en limitant la sélection de jetons au plus petit ensemble dont la probabilité cumulative dépasse cette valeur.",
+ "tr": "Kümülatif olasılığı bu değeri aşan en küçük sete token seçimini sınırlayarak çekirdek örneklemeyi kontrol eder.",
+ "de": "Steuert das Nucleus-Sampling, indem die Token-Auswahl auf die kleinste Menge beschränkt wird, deren kumulative Wahrscheinlichkeit diesen Wert überschreitet.",
+ "uk": "Контролює ядерну вибірку, обмежуючи вибір токенів до найменшого набору, кумулятивна ймовірність якого перевищує це значення.",
+ "ca": "Controla el mostreig de nucli limitant la selecció de tokens al conjunt més petit la probabilitat acumulativa del qual supera aquest valor."
+ },
+ "SCHEMA$LLM$TOP_P$LABEL": {
+ "en": "Top P",
+ "ja": "Top P",
+ "zh-CN": "Top P",
+ "zh-TW": "Top P",
+ "ko-KR": "Top P",
+ "no": "Top P",
+ "it": "Top P",
+ "pt": "Top P",
+ "es": "Top P",
+ "ar": "Top P",
+ "fr": "Top P",
+ "tr": "Top P",
+ "de": "Top P",
+ "uk": "Top P",
+ "ca": "Top P"
+ },
+ "SCHEMA$LLM$USAGE_ID$DESCRIPTION": {
+ "en": "Unique usage identifier for the LLM.",
+ "ja": "LLMのユニークな使用識別子。",
+ "zh-CN": "LLM的唯一使用标识符。",
+ "zh-TW": "LLM的唯一使用識別碼。",
+ "ko-KR": "LLM의 고유 사용 식별자.",
+ "no": "Unik bruksidentifikator for LLM.",
+ "it": "Identificatore di utilizzo univoco per l'LLM.",
+ "pt": "Identificador de uso único para o LLM.",
+ "es": "Identificador de uso único para el LLM.",
+ "ar": "معرف استخدام فريد لـ LLM.",
+ "fr": "Identifiant d'utilisation unique pour le LLM.",
+ "tr": "LLM için benzersiz kullanım tanımlayıcısı.",
+ "de": "Eindeutige Nutzungskennung für das LLM.",
+ "uk": "Унікальний ідентифікатор використання для LLM.",
+ "ca": "Identificador d'ús únic per a l'LLM."
+ },
+ "SCHEMA$LLM$USAGE_ID$LABEL": {
+ "en": "Usage ID",
+ "ja": "使用ID",
+ "zh-CN": "使用ID",
+ "zh-TW": "使用ID",
+ "ko-KR": "사용 ID",
+ "no": "Bruks-ID",
+ "it": "ID utilizzo",
+ "pt": "ID de uso",
+ "es": "ID de uso",
+ "ar": "معرف الاستخدام",
+ "fr": "ID d'utilisation",
+ "tr": "Kullanım kimliği",
+ "de": "Nutzungs-ID",
+ "uk": "ID використання",
+ "ca": "ID d'ús"
+ },
+ "SCHEMA$MAX_ITERATIONS$DESCRIPTION": {
+ "en": "Maximum number of iterations the conversation will run before stopping.",
+ "ja": "会話が停止するまでに実行される反復の最大数。",
+ "zh-CN": "会话在停止前将运行的最大迭代次数。",
+ "zh-TW": "會話在停止前將運行的最大迭代次數。",
+ "ko-KR": "대화가 중지되기 전에 실행되는 최대 반복 횟수입니다.",
+ "no": "Maksimalt antall iterasjoner samtalen vil kjøre før den stopper.",
+ "it": "Numero massimo di iterazioni che la conversazione eseguirà prima di fermarsi.",
+ "pt": "Número máximo de iterações que a conversa executará antes de parar.",
+ "es": "Número máximo de iteraciones que la conversación ejecutará antes de detenerse.",
+ "ar": "الحد الأقصى لعدد التكرارات التي ستشغلها المحادثة قبل التوقف.",
+ "fr": "Nombre maximum d'itérations que la conversation exécutera avant de s'arrêter.",
+ "tr": "Konuşmanın durmadan önce çalışacağı maksimum yineleme sayısı.",
+ "de": "Maximale Anzahl von Iterationen vor dem Stoppen der Konversation.",
+ "uk": "Максимальна кількість ітерацій розмови перед зупинкою.",
+ "ca": "Nombre màxim d'iteracions que la conversa executarà abans d'aturar-se."
+ },
+ "SCHEMA$MAX_ITERATIONS$LABEL": {
+ "en": "Max Iterations",
+ "ja": "最大反復回数",
+ "zh-CN": "最大迭代次数",
+ "zh-TW": "最大迭代次數",
+ "ko-KR": "최대 반복 횟수",
+ "no": "Maks iterasjoner",
+ "it": "Iterazioni massime",
+ "pt": "Iterações máximas",
+ "es": "Iteraciones máximas",
+ "ar": "الحد الأقصى للتكرارات",
+ "fr": "Itérations maximales",
+ "tr": "Maksimum Yineleme",
+ "de": "Maximale Iterationen",
+ "uk": "Максимальні ітерації",
+ "ca": "Iteracions màximes"
+ },
+ "SCHEMA$MCP_CONFIG$DESCRIPTION": {
+ "en": "MCP server configuration for the agent.",
+ "ja": "エージェント用のMCPサーバー設定。",
+ "zh-CN": "代理的MCP服务器配置。",
+ "zh-TW": "代理的MCP伺服器配置。",
+ "ko-KR": "에이전트용 MCP 서버 구성입니다.",
+ "no": "MCP-serverkonfigurasjon for agenten.",
+ "it": "Configurazione del server MCP per l'agente.",
+ "pt": "Configuração do servidor MCP para o agente.",
+ "es": "Configuración del servidor MCP para el agente.",
+ "ar": "تكوين خادم MCP للوكيل.",
+ "fr": "Configuration du serveur MCP pour l'agent.",
+ "tr": "Ajan için MCP sunucu yapılandırması.",
+ "de": "MCP-Serverkonfiguration für den Agenten.",
+ "uk": "Конфігурація сервера MCP для агента.",
+ "ca": "Configuració del servidor MCP per a l'agent."
+ },
+ "SCHEMA$MCP_CONFIG$LABEL": {
+ "en": "MCP configuration",
+ "ja": "MCP設定",
+ "zh-CN": "MCP配置",
+ "zh-TW": "MCP配置",
+ "ko-KR": "MCP 구성",
+ "no": "MCP-konfigurasjon",
+ "it": "Configurazione MCP",
+ "pt": "Configuração MCP",
+ "es": "Configuración MCP",
+ "ar": "تكوين MCP",
+ "fr": "Configuration MCP",
+ "tr": "MCP yapılandırması",
+ "de": "MCP-Konfiguration",
+ "uk": "Конфігурація MCP",
+ "ca": "Configuració MCP"
+ },
+ "SCHEMA$SECURITY_ANALYZER$CHOICE$LLM": {
+ "en": "LLM",
+ "ja": "LLM",
+ "zh-CN": "LLM",
+ "zh-TW": "LLM",
+ "ko-KR": "LLM",
+ "no": "LLM",
+ "it": "LLM",
+ "pt": "LLM",
+ "es": "LLM",
+ "ar": "LLM",
+ "fr": "LLM",
+ "tr": "LLM",
+ "de": "LLM",
+ "uk": "LLM",
+ "ca": "LLM"
+ },
+ "SCHEMA$SECURITY_ANALYZER$CHOICE$NONE": {
+ "en": "None",
+ "ja": "なし",
+ "zh-CN": "无",
+ "zh-TW": "無",
+ "ko-KR": "없음",
+ "no": "Ingen",
+ "it": "Nessuno",
+ "pt": "Nenhum",
+ "es": "Ninguno",
+ "ar": "لا شيء",
+ "fr": "Aucun",
+ "tr": "Yok",
+ "de": "Keins",
+ "uk": "Немає",
+ "ca": "Cap"
+ },
+ "SCHEMA$SECURITY_ANALYZER$DESCRIPTION": {
+ "en": "Security analyzer that evaluates actions before execution.",
+ "ja": "実行前にアクションを評価するセキュリティアナライザー。",
+ "zh-CN": "在执行前评估操作的安全分析器。",
+ "zh-TW": "在執行前評估操作的安全分析器。",
+ "ko-KR": "실행 전에 작업을 평가하는 보안 분석기입니다.",
+ "no": "Sikkerhetsanalysator som evaluerer handlinger før utførelse.",
+ "it": "Analizzatore di sicurezza che valuta le azioni prima dell'esecuzione.",
+ "pt": "Analisador de segurança que avalia ações antes da execução.",
+ "es": "Analizador de seguridad que evalúa las acciones antes de la ejecución.",
+ "ar": "محلل الأمان الذي يقيم الإجراءات قبل التنفيذ.",
+ "fr": "Analyseur de sécurité qui évalue les actions avant l'exécution.",
+ "tr": "Eylemleri yürütmeden önce değerlendiren güvenlik analizcisi.",
+ "de": "Sicherheitsanalysator, der Aktionen vor der Ausführung bewertet.",
+ "uk": "Аналізатор безпеки, який оцінює дії перед виконанням.",
+ "ca": "Analitzador de seguretat que avalua les accions abans de l'execució."
+ },
+ "SCHEMA$SECURITY_ANALYZER$LABEL": {
+ "en": "Security Analyzer",
+ "ja": "セキュリティアナライザー",
+ "zh-CN": "安全分析器",
+ "zh-TW": "安全分析器",
+ "ko-KR": "보안 분석기",
+ "no": "Sikkerhetsanalysator",
+ "it": "Analizzatore di sicurezza",
+ "pt": "Analisador de segurança",
+ "es": "Analizador de seguridad",
+ "ar": "محلل الأمان",
+ "fr": "Analyseur de sécurité",
+ "tr": "Güvenlik Analizcisi",
+ "de": "Sicherheitsanalysator",
+ "uk": "Аналізатор безпеки",
+ "ca": "Analitzador de seguretat"
+ },
+ "SCHEMA$TOOLS$DESCRIPTION": {
+ "en": "Tools available to the agent.",
+ "ja": "エージェントが利用可能なツール。",
+ "zh-CN": "代理可用的工具。",
+ "zh-TW": "代理可用的工具。",
+ "ko-KR": "에이전트가 사용할 수 있는 도구입니다.",
+ "no": "Verktøy tilgjengelig for agenten.",
+ "it": "Strumenti disponibili per l'agente.",
+ "pt": "Ferramentas disponíveis para o agente.",
+ "es": "Herramientas disponibles para el agente.",
+ "ar": "الأدوات المتاحة للوكيل.",
+ "fr": "Outils disponibles pour l'agent.",
+ "tr": "Ajan için mevcut araçlar.",
+ "de": "Für den Agenten verfügbare Werkzeuge.",
+ "uk": "Інструменти, доступні агенту.",
+ "ca": "Eines disponibles per a l'agent."
+ },
+ "SCHEMA$TOOLS$LABEL": {
+ "en": "Tools",
+ "ja": "ツール",
+ "zh-CN": "工具",
+ "zh-TW": "工具",
+ "ko-KR": "도구",
+ "no": "Verktøy",
+ "it": "Strumenti",
+ "pt": "Ferramentas",
+ "es": "Herramientas",
+ "ar": "الأدوات",
+ "fr": "Outils",
+ "tr": "Araçlar",
+ "de": "Werkzeuge",
+ "uk": "Інструменти",
+ "ca": "Eines"
+ },
+ "SCHEMA$VERIFICATION$CONFIRMATION_MODE$DESCRIPTION": {
+ "en": "Require user confirmation before executing risky actions.",
+ "ja": "リスクのあるアクションを実行する前にユーザー確認を要求する。",
+ "zh-CN": "在执行危险操作之前需要用户确认。",
+ "zh-TW": "在執行危險操作之前需要用戶確認。",
+ "ko-KR": "위험한 작업을 실행하기 전에 사용자 확인을 요구합니다.",
+ "no": "Krev brukerbekreftelse før utføring av risikable handlinger.",
+ "it": "Richiedi conferma utente prima di eseguire azioni rischiose.",
+ "pt": "Exigir confirmação do usuário antes de executar ações arriscadas.",
+ "es": "Requerir confirmación del usuario antes de ejecutar acciones arriesgadas.",
+ "ar": "تتطلب تأكيد المستخدم قبل تنفيذ الإجراءات الخطرة.",
+ "fr": "Exiger la confirmation de l'utilisateur avant d'exécuter des actions risquées.",
+ "tr": "Riskli işlemleri gerçekleştirmeden önce kullanıcı onayı iste.",
+ "de": "Benutzerbestätigung vor Ausführung riskanter Aktionen erforderlich.",
+ "uk": "Вимагати підтвердження користувача перед виконанням ризикованих дій.",
+ "ca": "Requereix confirmació de l'usuari abans d'executar accions de risc."
+ },
+ "SCHEMA$VERIFICATION$CONFIRMATION_MODE$LABEL": {
+ "en": "Confirmation Mode",
+ "ja": "確認モード",
+ "zh-CN": "确认模式",
+ "zh-TW": "確認模式",
+ "ko-KR": "확인 모드",
+ "no": "Bekreftelsesmodus",
+ "it": "Modalità conferma",
+ "pt": "Modo de confirmação",
+ "es": "Modo de confirmación",
+ "ar": "وضع التأكيد",
+ "fr": "Mode de confirmation",
+ "tr": "Onay modu",
+ "de": "Bestätigungsmodus",
+ "uk": "Режим підтвердження",
+ "ca": "Mode de confirmació"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_ENABLED$DESCRIPTION": {
+ "en": "Enable critic evaluation for the agent.",
+ "ja": "エージェントの批評評価を有効にする。",
+ "zh-CN": "为代理启用批评评估。",
+ "zh-TW": "為代理啟用批評評估。",
+ "ko-KR": "에이전트에 대한 비평 평가를 활성화합니다.",
+ "no": "Aktiver kritikervurdering for agenten.",
+ "it": "Abilita la valutazione critica per l'agente.",
+ "pt": "Ativar avaliação crítica para o agente.",
+ "es": "Habilitar la evaluación crítica para el agente.",
+ "ar": "تمكين تقييم النقد للوكيل.",
+ "fr": "Activer l'évaluation critique pour l'agent.",
+ "tr": "Ajan için eleştiri değerlendirmesini etkinleştir.",
+ "de": "Kritikerbewertung für den Agenten aktivieren.",
+ "uk": "Увімкнути критичну оцінку для агента.",
+ "ca": "Activa l'avaluació crítica per a l'agent."
+ },
+ "SCHEMA$VERIFICATION$CRITIC_ENABLED$LABEL": {
+ "en": "Enable Critic",
+ "ja": "批評を有効化",
+ "zh-CN": "启用批评",
+ "zh-TW": "啟用批評",
+ "ko-KR": "비평 활성화",
+ "no": "Aktiver kritiker",
+ "it": "Abilita critico",
+ "pt": "Ativar crítico",
+ "es": "Habilitar crítico",
+ "ar": "تمكين النقد",
+ "fr": "Activer le critique",
+ "tr": "Eleştiriyi etkinleştir",
+ "de": "Kritiker aktivieren",
+ "uk": "Увімкнути критика",
+ "ca": "Activa el crític"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$ALL_ACTIONS": {
+ "en": "All Actions",
+ "ja": "すべてのアクション",
+ "zh-CN": "所有操作",
+ "zh-TW": "所有操作",
+ "ko-KR": "모든 작업",
+ "no": "Alle handlinger",
+ "it": "Tutte le azioni",
+ "pt": "Todas as ações",
+ "es": "Todas las acciones",
+ "ar": "جميع الإجراءات",
+ "fr": "Toutes les actions",
+ "tr": "Tüm işlemler",
+ "de": "Alle Aktionen",
+ "uk": "Всі дії",
+ "ca": "Totes les accions"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODE$CHOICE$FINISH_AND_MESSAGE": {
+ "en": "Finish and Message",
+ "ja": "完了とメッセージ",
+ "zh-CN": "完成和消息",
+ "zh-TW": "完成和訊息",
+ "ko-KR": "완료 및 메시지",
+ "no": "Fullfør og melding",
+ "it": "Termina e messaggio",
+ "pt": "Finalizar e mensagem",
+ "es": "Finalizar y mensaje",
+ "ar": "إنهاء ورسالة",
+ "fr": "Terminer et message",
+ "tr": "Bitir ve mesaj",
+ "de": "Beenden und Nachricht",
+ "uk": "Завершити та повідомлення",
+ "ca": "Finalitza i missatge"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODE$DESCRIPTION": {
+ "en": "When critic evaluation should run.",
+ "ja": "批評評価を実行するタイミング。",
+ "zh-CN": "批评评估应该何时运行。",
+ "zh-TW": "批評評估應該何時執行。",
+ "ko-KR": "비평 평가를 실행해야 하는 시기.",
+ "no": "Når kritikervurdering skal kjøres.",
+ "it": "Quando deve essere eseguita la valutazione critica.",
+ "pt": "Quando a avaliação crítica deve ser executada.",
+ "es": "Cuándo debe ejecutarse la evaluación crítica.",
+ "ar": "متى يجب تشغيل تقييم النقد.",
+ "fr": "Quand l'évaluation critique doit s'exécuter.",
+ "tr": "Eleştiri değerlendirmesinin ne zaman çalışması gerektiği.",
+ "de": "Wann die Kritikerbewertung ausgeführt werden soll.",
+ "uk": "Коли має виконуватися критична оцінка.",
+ "ca": "Quan s'ha d'executar l'avaluació crítica."
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODE$LABEL": {
+ "en": "Critic Mode",
+ "ja": "批評モード",
+ "zh-CN": "批评模式",
+ "zh-TW": "批評模式",
+ "ko-KR": "비평 모드",
+ "no": "Kritikermodus",
+ "it": "Modalità critico",
+ "pt": "Modo crítico",
+ "es": "Modo crítico",
+ "ar": "وضع النقد",
+ "fr": "Mode critique",
+ "tr": "Eleştiri modu",
+ "de": "Kritikermodus",
+ "uk": "Режим критика",
+ "ca": "Mode crític"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$DESCRIPTION": {
+ "en": "Override the critic model name.",
+ "ja": "批評モデル名をオーバーライドする。",
+ "zh-CN": "覆盖批评模型名称。",
+ "zh-TW": "覆蓋批評模型名稱。",
+ "ko-KR": "비평 모델 이름을 재정의합니다.",
+ "no": "Overstyr kritikermodellnavnet.",
+ "it": "Sovrascrivi il nome del modello critico.",
+ "pt": "Substituir o nome do modelo crítico.",
+ "es": "Anular el nombre del modelo crítico.",
+ "ar": "تجاوز اسم نموذج النقد.",
+ "fr": "Remplacer le nom du modèle critique.",
+ "tr": "Eleştiri modeli adını geçersiz kıl.",
+ "de": "Den Namen des Kritikermodells überschreiben.",
+ "uk": "Перевизначити назву моделі критика.",
+ "ca": "Substitueix el nom del model crític."
+ },
+ "SCHEMA$VERIFICATION$CRITIC_MODEL_NAME$LABEL": {
+ "en": "Critic Model Name",
+ "ja": "批評モデル名",
+ "zh-CN": "批评模型名称",
+ "zh-TW": "批評模型名稱",
+ "ko-KR": "비평 모델 이름",
+ "no": "Kritikermodellnavn",
+ "it": "Nome modello critico",
+ "pt": "Nome do modelo crítico",
+ "es": "Nombre del modelo crítico",
+ "ar": "اسم نموذج النقد",
+ "fr": "Nom du modèle critique",
+ "tr": "Eleştiri modeli adı",
+ "de": "Kritikermodellname",
+ "uk": "Назва моделі критика",
+ "ca": "Nom del model crític"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_SERVER_URL$DESCRIPTION": {
+ "en": "Override the critic service URL.",
+ "ja": "批評サービスURLをオーバーライドする。",
+ "zh-CN": "覆盖批评服务URL。",
+ "zh-TW": "覆蓋批評服務URL。",
+ "ko-KR": "비평 서비스 URL을 재정의합니다.",
+ "no": "Overstyr kritikertjenestens URL.",
+ "it": "Sovrascrivi l'URL del servizio critico.",
+ "pt": "Substituir a URL do serviço crítico.",
+ "es": "Anular la URL del servicio crítico.",
+ "ar": "تجاوز عنوان URL لخدمة النقد.",
+ "fr": "Remplacer l'URL du service critique.",
+ "tr": "Eleştiri hizmeti URL'sini geçersiz kıl.",
+ "de": "Die URL des Kritikerdienstes überschreiben.",
+ "uk": "Перевизначити URL сервісу критика.",
+ "ca": "Substitueix l'URL del servei crític."
+ },
+ "SCHEMA$VERIFICATION$CRITIC_SERVER_URL$LABEL": {
+ "en": "Critic Server URL",
+ "ja": "批評サーバーURL",
+ "zh-CN": "批评服务器URL",
+ "zh-TW": "批評伺服器URL",
+ "ko-KR": "비평 서버 URL",
+ "no": "Kritikertjener-URL",
+ "it": "URL server critico",
+ "pt": "URL do servidor crítico",
+ "es": "URL del servidor crítico",
+ "ar": "عنوان URL لخادم النقد",
+ "fr": "URL du serveur critique",
+ "tr": "Eleştiri sunucusu URL'si",
+ "de": "Kritikerserver-URL",
+ "uk": "URL сервера критика",
+ "ca": "URL del servidor crític"
+ },
+ "SCHEMA$VERIFICATION$CRITIC_THRESHOLD$DESCRIPTION": {
+ "en": "Critic success threshold used for iterative refinement.",
+ "ja": "反復改善に使用される批評成功閾値。",
+ "zh-CN": "用于迭代改进的批评成功阈值。",
+ "zh-TW": "用於迭代改進的批評成功閾值。",
+ "ko-KR": "반복 개선에 사용되는 비평 성공 임계값.",
+ "no": "Kritikersuksessterskel brukt for iterativ forbedring.",
+ "it": "Soglia di successo del critico utilizzata per il perfezionamento iterativo.",
+ "pt": "Limite de sucesso do crítico usado para refinamento iterativo.",
+ "es": "Umbral de éxito del crítico utilizado para el refinamiento iterativo.",
+ "ar": "عتبة نجاح النقد المستخدمة للتحسين التكراري.",
+ "fr": "Seuil de succès du critique utilisé pour le raffinement itératif.",
+ "tr": "Yinelemeli iyileştirme için kullanılan eleştiri başarı eşiği.",
+ "de": "Erfolgsschwelle des Kritikers für iterative Verfeinerung.",
+ "uk": "Поріг успіху критика, що використовується для ітеративного вдосконалення.",
+ "ca": "Llindar d'èxit del crític utilitzat per al refinament iteratiu."
+ },
+ "SCHEMA$VERIFICATION$CRITIC_THRESHOLD$LABEL": {
+ "en": "Critic Threshold",
+ "ja": "批評閾値",
+ "zh-CN": "批评阈值",
+ "zh-TW": "批評閾值",
+ "ko-KR": "비평 임계값",
+ "no": "Kritikerterskel",
+ "it": "Soglia critico",
+ "pt": "Limite do crítico",
+ "es": "Umbral del crítico",
+ "ar": "عتبة النقد",
+ "fr": "Seuil du critique",
+ "tr": "Eleştiri eşiği",
+ "de": "Kritikerschwelle",
+ "uk": "Поріг критика",
+ "ca": "Llindar del crític"
+ },
+ "SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$DESCRIPTION": {
+ "en": "Automatically retry tasks when critic scores fall below the threshold.",
+ "ja": "批評スコアが閾値を下回った場合にタスクを自動的に再試行する。",
+ "zh-CN": "当批评分数低于阈值时自动重试任务。",
+ "zh-TW": "當批評分數低於閾值時自動重試任務。",
+ "ko-KR": "비평 점수가 임계값 이하로 떨어지면 작업을 자동으로 재시도합니다.",
+ "no": "Prøv automatisk på nytt oppgaver når kritikerskårer faller under terskelen.",
+ "it": "Riprova automaticamente le attività quando i punteggi del critico scendono sotto la soglia.",
+ "pt": "Repetir automaticamente tarefas quando as pontuações do crítico ficarem abaixo do limite.",
+ "es": "Reintentar automáticamente las tareas cuando las puntuaciones del crítico caigan por debajo del umbral.",
+ "ar": "إعادة محاولة المهام تلقائيًا عندما تنخفض درجات النقد عن العتبة.",
+ "fr": "Réessayer automatiquement les tâches lorsque les scores du critique tombent en dessous du seuil.",
+ "tr": "Eleştiri puanları eşiğin altına düştüğünde görevleri otomatik olarak yeniden dene.",
+ "de": "Aufgaben automatisch wiederholen, wenn Kritikerbewertungen unter den Schwellenwert fallen.",
+ "uk": "Автоматично повторювати завдання, коли оцінки критика падають нижче порогу.",
+ "ca": "Reintenta automàticament les tasques quan les puntuacions del crític cauen per sota del llindar."
+ },
+ "SCHEMA$VERIFICATION$ENABLE_ITERATIVE_REFINEMENT$LABEL": {
+ "en": "Enable Iterative Refinement",
+ "ja": "反復改善を有効化",
+ "zh-CN": "启用迭代改进",
+ "zh-TW": "啟用迭代改進",
+ "ko-KR": "반복 개선 활성화",
+ "no": "Aktiver iterativ forbedring",
+ "it": "Abilita perfezionamento iterativo",
+ "pt": "Ativar refinamento iterativo",
+ "es": "Habilitar refinamiento iterativo",
+ "ar": "تمكين التحسين التكراري",
+ "fr": "Activer le raffinement itératif",
+ "tr": "Yinelemeli iyileştirmeyi etkinleştir",
+ "de": "Iterative Verfeinerung aktivieren",
+ "uk": "Увімкнути ітеративне вдосконалення",
+ "ca": "Activa el refinament iteratiu"
+ },
+ "SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$DESCRIPTION": {
+ "en": "Maximum number of refinement attempts after critic feedback.",
+ "ja": "批評フィードバック後の改善試行の最大回数。",
+ "zh-CN": "批评反馈后的最大改进尝试次数。",
+ "zh-TW": "批評反饋後的最大改進嘗試次數。",
+ "ko-KR": "비평 피드백 후 최대 개선 시도 횟수.",
+ "no": "Maksimalt antall forbedringsforsøk etter kritikertilbakemelding.",
+ "it": "Numero massimo di tentativi di perfezionamento dopo il feedback del critico.",
+ "pt": "Número máximo de tentativas de refinamento após feedback do crítico.",
+ "es": "Número máximo de intentos de refinamiento después de la retroalimentación del crítico.",
+ "ar": "الحد الأقصى لعدد محاولات التحسين بعد ملاحظات النقد.",
+ "fr": "Nombre maximum de tentatives de raffinement après le retour du critique.",
+ "tr": "Eleştiri geri bildiriminden sonra maksimum iyileştirme denemesi sayısı.",
+ "de": "Maximale Anzahl von Verfeinerungsversuchen nach Kritikerfeedback.",
+ "uk": "Максимальна кількість спроб вдосконалення після відгуку критика.",
+ "ca": "Nombre màxim d'intents de refinament després del feedback del crític."
+ },
+ "SCHEMA$VERIFICATION$MAX_REFINEMENT_ITERATIONS$LABEL": {
+ "en": "Max Refinement Iterations",
+ "ja": "最大改善反復回数",
+ "zh-CN": "最大改进迭代次数",
+ "zh-TW": "最大改進迭代次數",
+ "ko-KR": "최대 개선 반복 횟수",
+ "no": "Maks forbedringsterasjoner",
+ "it": "Iterazioni di perfezionamento massime",
+ "pt": "Máximo de iterações de refinamento",
+ "es": "Máximo de iteraciones de refinamiento",
+ "ar": "الحد الأقصى لتكرارات التحسين",
+ "fr": "Itérations de raffinement max",
+ "tr": "Maks iyileştirme yinelemesi",
+ "de": "Max. Verfeinerungsiterationen",
+ "uk": "Макс. ітерацій вдосконалення",
+ "ca": "Màxim d'iteracions de refinament"
+ },
+ "SCHEMA$VERIFICATION$SECTION_LABEL": {
+ "en": "Verification",
+ "ja": "検証",
+ "zh-CN": "验证",
+ "zh-TW": "驗證",
+ "ko-KR": "검증",
+ "no": "Verifisering",
+ "it": "Verifica",
+ "pt": "Verificação",
+ "es": "Verificación",
+ "ar": "التحقق",
+ "fr": "Vérification",
+ "tr": "Doğrulama",
+ "de": "Verifizierung",
+ "uk": "Верифікація",
+ "ca": "Verificació"
+ },
+ "SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$LLM": {
+ "en": "LLM",
+ "ja": "LLM",
+ "zh-CN": "LLM",
+ "zh-TW": "LLM",
+ "ko-KR": "LLM",
+ "no": "LLM",
+ "it": "LLM",
+ "pt": "LLM",
+ "es": "LLM",
+ "ar": "LLM",
+ "fr": "LLM",
+ "tr": "LLM",
+ "de": "LLM",
+ "uk": "LLM",
+ "ca": "LLM"
+ },
+ "SCHEMA$VERIFICATION$SECURITY_ANALYZER$CHOICE$NONE": {
+ "en": "None",
+ "ja": "なし",
+ "zh-CN": "无",
+ "zh-TW": "無",
+ "ko-KR": "없음",
+ "no": "Ingen",
+ "it": "Nessuno",
+ "pt": "Nenhum",
+ "es": "Ninguno",
+ "ar": "لا شيء",
+ "fr": "Aucun",
+ "tr": "Yok",
+ "de": "Keine",
+ "uk": "Немає",
+ "ca": "Cap"
+ },
+ "SCHEMA$VERIFICATION$SECURITY_ANALYZER$DESCRIPTION": {
+ "en": "Security analyzer that evaluates actions before execution.",
+ "ja": "実行前にアクションを評価するセキュリティアナライザー。",
+ "zh-CN": "在执行前评估操作的安全分析器。",
+ "zh-TW": "在執行前評估操作的安全分析器。",
+ "ko-KR": "실행 전에 작업을 평가하는 보안 분석기.",
+ "no": "Sikkerhetsanalyser som evaluerer handlinger før utføring.",
+ "it": "Analizzatore di sicurezza che valuta le azioni prima dell'esecuzione.",
+ "pt": "Analisador de segurança que avalia ações antes da execução.",
+ "es": "Analizador de seguridad que evalúa las acciones antes de la ejecución.",
+ "ar": "محلل أمان يقيم الإجراءات قبل التنفيذ.",
+ "fr": "Analyseur de sécurité qui évalue les actions avant l'exécution.",
+ "tr": "Yürütmeden önce işlemleri değerlendiren güvenlik analizörü.",
+ "de": "Sicherheitsanalysator, der Aktionen vor der Ausführung bewertet.",
+ "uk": "Аналізатор безпеки, що оцінює дії перед виконанням.",
+ "ca": "Analitzador de seguretat que avalua les accions abans de l'execució."
+ },
+ "SCHEMA$VERIFICATION$SECURITY_ANALYZER$LABEL": {
+ "en": "Security Analyzer",
+ "ja": "セキュリティアナライザー",
+ "zh-CN": "安全分析器",
+ "zh-TW": "安全分析器",
+ "ko-KR": "보안 분석기",
+ "no": "Sikkerhetsanalyser",
+ "it": "Analizzatore di sicurezza",
+ "pt": "Analisador de segurança",
+ "es": "Analizador de seguridad",
+ "ar": "محلل الأمان",
+ "fr": "Analyseur de sécurité",
+ "tr": "Güvenlik analizörü",
+ "de": "Sicherheitsanalysator",
+ "uk": "Аналізатор безпеки",
+ "ca": "Analitzador de seguretat"
+ },
"SETTINGS$NAV_INTEGRATIONS": {
"en": "Integrations",
"ja": "統合",
@@ -2192,6 +4861,40 @@
"uk": "Це налаштування впливає на всю організацію",
"ca": "Aquesta configuració afecta tota l'organització"
},
+ "SETTINGS$ORG_DEFAULTS_INFO": {
+ "en": "These organization defaults are applied first. Members can still add their own credentials or personal overrides where allowed.",
+ "ja": "これらの組織のデフォルト設定が最初に適用されます。メンバーは許可されている範囲で、自分の認証情報や個人設定を追加できます。",
+ "zh-CN": "这些组织默认设置会首先应用。成员仍然可以在允许的范围内添加自己的凭据或个人覆盖设置。",
+ "zh-TW": "這些組織預設設定會首先套用。成員仍然可以在允許的範圍內新增自己的憑證或個人覆蓋設定。",
+ "ko-KR": "이 조직 기본 설정이 먼저 적용됩니다. 구성원은 허용되는 범위 내에서 자체 자격 증명이나 개인 재정의를 추가할 수 있습니다.",
+ "no": "Disse organisasjonsstandardene brukes først. Medlemmer kan fortsatt legge til egne legitimasjoner eller personlige overstyringer der det er tillatt.",
+ "it": "Queste impostazioni predefinite dell'organizzazione vengono applicate per prime. I membri possono comunque aggiungere le proprie credenziali o sostituzioni personali dove consentito.",
+ "pt": "Esses padrões da organização são aplicados primeiro. Os membros ainda podem adicionar suas próprias credenciais ou substituições pessoais onde permitido.",
+ "es": "Estos valores predeterminados de la organización se aplican primero. Los miembros aún pueden agregar sus propias credenciales o anulaciones personales donde esté permitido.",
+ "ar": "يتم تطبيق إعدادات المؤسسة الافتراضية أولاً. لا يزال بإمكان الأعضاء إضافة بيانات اعتمادهم أو تجاوزاتهم الشخصية حيثما كان ذلك مسموحًا.",
+ "fr": "Ces paramètres par défaut de l'organisation sont appliqués en premier. Les membres peuvent toujours ajouter leurs propres identifiants ou remplacements personnels lorsque cela est autorisé.",
+ "tr": "Bu organizasyon varsayılanları önce uygulanır. Üyeler izin verilen yerlerde kendi kimlik bilgilerini veya kişisel geçersiz kılmalarını ekleyebilir.",
+ "de": "Diese Organisationsstandards werden zuerst angewendet. Mitglieder können weiterhin eigene Anmeldedaten oder persönliche Überschreibungen hinzufügen, wo dies erlaubt ist.",
+ "uk": "Ці стандартні налаштування організації застосовуються першими. Учасники все ще можуть додавати власні облікові дані або особисті перевизначення там, де це дозволено.",
+ "ca": "Aquests valors predeterminats de l'organització s'apliquen primer. Els membres encara poden afegir les seves pròpies credencials o substitucions personals on estigui permès."
+ },
+ "SETTINGS$PERSONAL_AGENT_INFO": {
+ "en": "These settings only affect your own work. Organization defaults still apply unless you override them here.",
+ "ja": "これらの設定はあなた自身の作業にのみ影響します。ここで上書きしない限り、組織のデフォルト設定が引き続き適用されます。",
+ "zh-CN": "这些设置仅影响您自己的工作。除非您在此处覆盖,否则组织默认设置仍然适用。",
+ "zh-TW": "這些設定僅影響您自己的工作。除非您在此處覆蓋,否則組織預設設定仍然適用。",
+ "ko-KR": "이 설정은 본인의 작업에만 영향을 미칩니다. 여기에서 재정의하지 않는 한 조직 기본 설정이 계속 적용됩니다.",
+ "no": "Disse innstillingene påvirker kun ditt eget arbeid. Organisasjonsstandarder gjelder fortsatt med mindre du overstyrer dem her.",
+ "it": "Queste impostazioni influiscono solo sul proprio lavoro. Le impostazioni predefinite dell'organizzazione si applicano ancora a meno che non vengano sostituite qui.",
+ "pt": "Essas configurações afetam apenas seu próprio trabalho. Os padrões da organização ainda se aplicam, a menos que você os substitua aqui.",
+ "es": "Estos ajustes solo afectan tu propio trabajo. Los valores predeterminados de la organización siguen aplicándose a menos que los anules aquí.",
+ "ar": "تؤثر هذه الإعدادات على عملك فقط. تظل إعدادات المؤسسة الافتراضية سارية ما لم تتجاوزها هنا.",
+ "fr": "Ces paramètres n'affectent que votre propre travail. Les paramètres par défaut de l'organisation s'appliquent toujours sauf si vous les remplacez ici.",
+ "tr": "Bu ayarlar yalnızca kendi çalışmanızı etkiler. Burada geçersiz kılmadığınız sürece organizasyon varsayılanları geçerli olmaya devam eder.",
+ "de": "Diese Einstellungen betreffen nur Ihre eigene Arbeit. Organisationsstandards gelten weiterhin, sofern Sie sie hier nicht überschreiben.",
+ "uk": "Ці налаштування впливають лише на вашу власну роботу. Стандартні налаштування організації все ще застосовуються, якщо ви не перевизначите їх тут.",
+ "ca": "Aquests ajustos només afecten el vostre propi treball. Els valors predeterminats de l'organització encara s'apliquen tret que els substituïu aquí."
+ },
"SETTINGS$GITHUB": {
"en": "GitHub",
"ja": "GitHub",
@@ -2328,6 +5031,23 @@
"uk": "GitLab",
"ca": "GitLab"
},
+ "SETTINGS$NAV_CONDENSER": {
+ "en": "Condenser",
+ "ja": "コンデンサー",
+ "zh-CN": "压缩器",
+ "zh-TW": "壓縮器",
+ "ko-KR": "압축기",
+ "no": "Kondensator",
+ "it": "Condensatore",
+ "pt": "Condensador",
+ "es": "Condensador",
+ "ar": "المكثف",
+ "fr": "Condenseur",
+ "tr": "Yoğunlaştırıcı",
+ "de": "Kondensator",
+ "uk": "Конденсатор",
+ "ca": "Condensador"
+ },
"SETTINGS$NAV_LLM": {
"en": "LLM",
"ja": "LLM",
@@ -2345,6 +5065,23 @@
"uk": "LLM",
"ca": "LLM"
},
+ "SETTINGS$NAV_VERIFICATION": {
+ "en": "Verification",
+ "ja": "検証",
+ "zh-CN": "验证",
+ "zh-TW": "驗證",
+ "ko-KR": "검증",
+ "no": "Verifisering",
+ "it": "Verifica",
+ "pt": "Verificação",
+ "es": "Verificación",
+ "ar": "التحقق",
+ "fr": "Vérification",
+ "tr": "Doğrulama",
+ "de": "Verifizierung",
+ "uk": "Верифікація",
+ "ca": "Verificació"
+ },
"GIT$MERGE_REQUEST": {
"en": "Merge Request",
"ja": "マージリクエスト",
@@ -17064,8 +19801,7 @@
"fr": "Nom de l'organisation",
"tr": "Organizasyon Adı",
"de": "Organisationsname",
- "uk": "Назва організації"
- ,
+ "uk": "Назва організації",
"ca": "Nom de l'organització"
},
"ORG$NEXT": {
@@ -18884,8 +21620,7 @@
"pt": "Erro",
"es": "Error",
"tr": "Hata",
- "uk": "Помилка"
- ,
+ "uk": "Помилка",
"ca": "Error"
},
"HOOK$OUTPUT": {
@@ -19242,8 +21977,7 @@
"pt": "Nome da organização",
"es": "Nombre de la organización",
"tr": "Organizasyon adı",
- "uk": "Назва організації"
- ,
+ "uk": "Назва організації",
"ca": "Nom de l'organització"
},
"ONBOARDING$ORG_NAME_INPUT_DOMAIN": {
@@ -20059,8 +22793,7 @@
"pt": "Saiba mais",
"es": "Más información",
"tr": "Daha Fazla Bilgi",
- "uk": "Дізнатися більше"
- ,
+ "uk": "Дізнатися більше",
"ca": "Més informació"
},
"ENTERPRISE$LEARN_MORE_ARIA": {
@@ -20111,8 +22844,7 @@
"pt": "Erro",
"es": "Error",
"tr": "Hata",
- "uk": "Помилка"
- ,
+ "uk": "Помилка",
"ca": "Error"
},
"DEVICE$SUCCESS_MESSAGE": {
@@ -20486,8 +23218,7 @@
"fr": "En savoir plus",
"tr": "Daha fazla bilgi",
"de": "Mehr erfahren",
- "uk": "Дізнатися більше"
- ,
+ "uk": "Дізнатися більше",
"ca": "Més informació"
},
"ENTERPRISE$GET_OPENHANDS_TITLE": {
diff --git a/frontend/src/mocks/org-handlers.ts b/frontend/src/mocks/org-handlers.ts
index 9b7cd930ae..05597a5285 100644
--- a/frontend/src/mocks/org-handlers.ts
+++ b/frontend/src/mocks/org-handlers.ts
@@ -6,14 +6,22 @@ import {
UpdateOrganizationMemberParams,
} from "#/types/org";
+const MOCK_MEMBER_AGENT_SETTINGS = {
+ llm: {
+ model: "gpt-4",
+ base_url: "https://api.openai.com",
+ },
+ max_iterations: 20,
+};
+
const MOCK_ME: Omit<OrganizationMember, "role" | "org_id"> = {
user_id: "99",
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
};
@@ -28,23 +36,29 @@ export const createMockOrganization = (
contact_name: "Contact Name",
contact_email: "[email protected]",
conversation_expiration: 86400,
- agent: "default-agent",
- default_max_iterations: 20,
- security_analyzer: "standard",
- confirmation_mode: false,
- default_llm_model: "gpt-5-1",
- default_llm_api_key_for_byor: "*********",
- default_llm_base_url: "https://api.example-llm.com",
remote_runtime_resource_factor: 2,
- enable_default_condenser: true,
billing_margin: 0.15,
enable_proactive_conversation_starters: true,
sandbox_base_container_image: "ghcr.io/example/sandbox-base:latest",
sandbox_runtime_container_image: "ghcr.io/example/sandbox-runtime:latest",
org_version: 0,
- mcp_config: {
- tools: [],
- settings: {},
+ agent_settings: {
+ agent: "default-agent",
+ max_iterations: 20,
+ security_analyzer: "standard",
+ confirmation_mode: false,
+ llm: {
+ model: "gpt-5-1",
+ base_url: "https://api.example-llm.com",
+ },
+ condenser: {
+ enabled: true,
+ max_size: 240,
+ },
+ mcp_config: {
+ tools: [],
+ settings: {},
+ },
},
search_api_key: null,
sandbox_api_key: null,
@@ -91,8 +105,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
],
@@ -105,8 +119,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -117,8 +131,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -129,8 +143,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
],
@@ -143,8 +157,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -155,8 +169,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
],
@@ -169,8 +183,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -181,8 +195,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -193,8 +207,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -205,8 +219,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "active",
},
{
@@ -217,8 +231,8 @@ const INITIAL_MOCK_MEMBERS: Record<string, OrganizationMember[]> = {
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "invited",
},
],
@@ -543,8 +557,8 @@ export const ORG_HANDLERS = [
llm_api_key: "**********",
max_iterations: 20,
llm_model: "gpt-4",
- llm_api_key_for_byor: null,
llm_base_url: "https://api.openai.com",
+ agent_settings: MOCK_MEMBER_AGENT_SETTINGS,
status: "invited" as const,
}));
diff --git a/frontend/src/mocks/settings-handlers.ts b/frontend/src/mocks/settings-handlers.ts
index da224d6109..7c8784777a 100644
--- a/frontend/src/mocks/settings-handlers.ts
+++ b/frontend/src/mocks/settings-handlers.ts
@@ -1,12 +1,43 @@
import { http, delay, HttpResponse } from "msw";
import { WebClientConfig } from "#/api/option-service/option.types";
import { DEFAULT_SETTINGS } from "#/services/settings";
-import { Provider, Settings } from "#/types/settings";
+import { Provider, Settings, SettingsValue } from "#/types/settings";
+
+/** Simple recursive merge — objects merge, scalars overwrite. */
+function deepMerge(
+ base: Record<string, unknown>,
+ patch: Record<string, unknown>,
+): Record<string, unknown> {
+ const result = { ...base };
+ for (const [key, value] of Object.entries(patch)) {
+ if (
+ value != null &&
+ typeof value === "object" &&
+ !Array.isArray(value) &&
+ typeof result[key] === "object" &&
+ result[key] != null &&
+ !Array.isArray(result[key])
+ ) {
+ result[key] = deepMerge(
+ result[key] as Record<string, unknown>,
+ value as Record<string, unknown>,
+ );
+ } else {
+ result[key] = value;
+ }
+ }
+ return result;
+}
+
+const DEFAULT_AGENT_SETTINGS = DEFAULT_SETTINGS.agent_settings ?? {};
+const llmDefaults = (DEFAULT_AGENT_SETTINGS as Record<string, unknown>).llm as
+ | Record<string, unknown>
+ | undefined;
+const DEFAULT_MODEL =
+ typeof llmDefaults?.model === "string"
+ ? llmDefaults.model
+ : "openhands/claude-opus-4-5-20251101";
-/**
- * Creates a mock WebClientConfig with all required fields.
- * Use this helper to create test config objects with sensible defaults.
- */
export const createMockWebClientConfig = (
overrides: Partial<WebClientConfig> = {},
): WebClientConfig => ({
@@ -34,27 +65,197 @@ export const createMockWebClientConfig = (
...overrides,
});
+const MOCK_AGENT_SETTINGS_SCHEMA: NonNullable<
+ Settings["agent_settings_schema"]
+> = {
+ model_name: "AgentSettings",
+ sections: [
+ {
+ key: "llm",
+ label: "LLM",
+ fields: [
+ {
+ key: "llm.model",
+ label: "Model",
+ description: "Select the model to use for this conversation.",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: DEFAULT_MODEL,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "llm.api_key",
+ label: "API Key",
+ description:
+ "Provide the API key used to authenticate requests for the selected model.",
+
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: true,
+ required: false,
+ },
+ {
+ key: "llm.base_url",
+ description:
+ "Override the model provider's default API base URL when needed.",
+
+ label: "Base URL",
+ section: "llm",
+ section_label: "LLM",
+ value_type: "string",
+ default: null,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ {
+ key: "critic",
+ label: "Critic",
+ fields: [
+ {
+ description:
+ "Enable an additional critic pass to review the agent's work.",
+
+ key: "critic.enabled",
+ label: "Enable critic",
+ section: "critic",
+ section_label: "Critic",
+ value_type: "boolean",
+ default: false,
+ choices: [],
+ depends_on: [],
+ prominence: "critical",
+ secret: false,
+ required: true,
+ },
+ {
+ description: "Choose when the critic should review and intervene.",
+
+ key: "critic.mode",
+ label: "Mode",
+ section: "critic",
+ section_label: "Critic",
+ value_type: "string",
+ default: "finish_and_message",
+ choices: [
+ { label: "finish_and_message", value: "finish_and_message" },
+ { label: "all_actions", value: "all_actions" },
+ ],
+ depends_on: ["critic.enabled"],
+ prominence: "minor",
+ secret: false,
+ required: true,
+ },
+ ],
+ },
+ ],
+};
+
+const MOCK_CONVERSATION_SETTINGS_SCHEMA: NonNullable<
+ Settings["conversation_settings_schema"]
+> = {
+ model_name: "ConversationSettings",
+ sections: [
+ {
+ key: "general",
+ label: "General",
+ fields: [
+ {
+ key: "max_iterations",
+ label: "Max iterations",
+ section: "general",
+ description:
+ "Maximum number of agent steps allowed before the conversation stops.",
+
+ section_label: "General",
+ value_type: "integer",
+ default: 500,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ ],
+ },
+ {
+ key: "verification",
+ label: "Verification",
+ fields: [
+ {
+ key: "confirmation_mode",
+ label: "Confirmation mode",
+ description:
+ "Pause for confirmation before the agent performs high-risk actions.",
+
+ section: "verification",
+ section_label: "Verification",
+ value_type: "boolean",
+ default: false,
+ choices: [],
+ depends_on: [],
+ prominence: "major",
+ secret: false,
+ required: true,
+ },
+ {
+ key: "security_analyzer",
+ label: "Security analyzer",
+ description:
+ "Choose how OpenHands should analyze actions before asking for confirmation.",
+
+ section: "verification",
+ section_label: "Verification",
+ value_type: "string",
+ default: "llm",
+ choices: [
+ { label: "llm", value: "llm" },
+ { label: "none", value: "none" },
+ ],
+ depends_on: ["confirmation_mode"],
+ prominence: "major",
+ secret: false,
+ required: false,
+ },
+ ],
+ },
+ ],
+};
+
export const MOCK_DEFAULT_USER_SETTINGS: Settings = {
- llm_model: DEFAULT_SETTINGS.llm_model,
- llm_base_url: DEFAULT_SETTINGS.llm_base_url,
- llm_api_key: null,
- llm_api_key_set: DEFAULT_SETTINGS.llm_api_key_set,
- search_api_key_set: DEFAULT_SETTINGS.search_api_key_set,
- agent: DEFAULT_SETTINGS.agent,
- language: DEFAULT_SETTINGS.language,
- confirmation_mode: DEFAULT_SETTINGS.confirmation_mode,
- security_analyzer: DEFAULT_SETTINGS.security_analyzer,
- remote_runtime_resource_factor:
- DEFAULT_SETTINGS.remote_runtime_resource_factor,
+ ...DEFAULT_SETTINGS,
provider_tokens_set: {},
- enable_default_condenser: DEFAULT_SETTINGS.enable_default_condenser,
- condenser_max_size: DEFAULT_SETTINGS.condenser_max_size,
- enable_sound_notifications: DEFAULT_SETTINGS.enable_sound_notifications,
- enable_proactive_conversation_starters:
- DEFAULT_SETTINGS.enable_proactive_conversation_starters,
- enable_solvability_analysis: DEFAULT_SETTINGS.enable_solvability_analysis,
- user_consents_to_analytics: DEFAULT_SETTINGS.user_consents_to_analytics,
- max_budget_per_task: DEFAULT_SETTINGS.max_budget_per_task,
+ agent_settings_schema: MOCK_AGENT_SETTINGS_SCHEMA,
+ agent_settings: {
+ ...DEFAULT_AGENT_SETTINGS,
+ critic: {
+ mode: "finish_and_message",
+ enabled: false,
+ },
+ llm: {
+ ...(llmDefaults ?? {}),
+ api_key: null,
+ model: DEFAULT_MODEL,
+ },
+ },
+ conversation_settings_schema: MOCK_CONVERSATION_SETTINGS_SCHEMA,
+ conversation_settings: {
+ ...(DEFAULT_SETTINGS.conversation_settings ?? {}),
+ },
};
const MOCK_USER_PREFERENCES: {
@@ -63,9 +264,8 @@ const MOCK_USER_PREFERENCES: {
settings: null,
};
-// Reset mock
export const resetTestHandlersMockSettings = () => {
- MOCK_USER_PREFERENCES.settings = MOCK_DEFAULT_USER_SETTINGS;
+ MOCK_USER_PREFERENCES.settings = structuredClone(MOCK_DEFAULT_USER_SETTINGS);
};
// Mock model data used by both V0 and V1 endpoints
@@ -205,8 +405,6 @@ export const SETTINGS_HANDLERS = [
},
providers_configured: [],
maintenance_start_time: null,
- // Uncomment the following to test the maintenance banner
- // maintenance_start_time: "2024-01-15T10:00:00-05:00", // EST timestamp
auth_url: null,
recaptcha_site_key: null,
faulty_models: [],
@@ -218,6 +416,11 @@ export const SETTINGS_HANDLERS = [
return HttpResponse.json(config);
}),
+ http.get("/api/v1/settings/conversation-schema", async () => {
+ await delay();
+ return HttpResponse.json(MOCK_CONVERSATION_SETTINGS_SCHEMA);
+ }),
+
http.get("/api/v1/settings", async () => {
await delay();
const { settings } = MOCK_USER_PREFERENCES;
@@ -227,20 +430,55 @@ export const SETTINGS_HANDLERS = [
return HttpResponse.json(settings);
}),
+ http.get("/api/v1/settings/agent-schema", async () => {
+ await delay();
+ return HttpResponse.json(MOCK_AGENT_SETTINGS_SCHEMA);
+ }),
+
http.post("/api/v1/settings", async ({ request }) => {
await delay();
- const body = await request.json();
+ const body = (await request.json()) as Record<string, unknown> | null;
if (body) {
- const current = MOCK_USER_PREFERENCES.settings || {
- ...MOCK_DEFAULT_USER_SETTINGS,
- };
+ const current =
+ MOCK_USER_PREFERENCES.settings ||
+ structuredClone(MOCK_DEFAULT_USER_SETTINGS);
- MOCK_USER_PREFERENCES.settings = {
- ...current,
- ...(body as Partial<Settings>),
- };
+ const nextSettings: Settings = { ...current };
+
+ // Deep-merge nested agent_settings
+ if (body.agent_settings && typeof body.agent_settings === "object") {
+ const merged = deepMerge(
+ (current.agent_settings ?? {}) as Record<string, unknown>,
+ body.agent_settings as Record<string, unknown>,
+ );
+ nextSettings.agent_settings = merged as Settings["agent_settings"];
+ }
+
+ // Deep-merge nested conversation_settings
+ if (
+ body.conversation_settings &&
+ typeof body.conversation_settings === "object"
+ ) {
+ nextSettings.conversation_settings = {
+ ...(current.conversation_settings ?? {}),
+ ...(body.conversation_settings as Record<string, SettingsValue>),
+ };
+ }
+
+ // Apply top-level fields (excluding nested settings)
+ for (const [key, value] of Object.entries(body)) {
+ if (
+ key !== "agent_settings" &&
+ key !== "conversation_settings" &&
+ key !== "agent_settings_schema" &&
+ key !== "conversation_settings_schema"
+ ) {
+ (nextSettings as Record<string, unknown>)[key] = value;
+ }
+ }
+ MOCK_USER_PREFERENCES.settings = nextSettings;
return HttpResponse.json(null, { status: 200 });
}
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 03a0d690b1..a006d15fc9 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -15,6 +15,17 @@ export default [
route("launch", "routes/launch.tsx"),
route("settings", "routes/settings.tsx", [
index("routes/llm-settings.tsx"),
+ route("condenser", "routes/condenser-settings.tsx"),
+ route("verification", "routes/verification-settings.tsx"),
+ route("org-defaults", "routes/org-default-llm-settings.tsx"),
+ route(
+ "org-defaults/condenser",
+ "routes/org-default-condenser-settings.tsx",
+ ),
+ route(
+ "org-defaults/verification",
+ "routes/org-default-verification-settings.tsx",
+ ),
route("mcp", "routes/mcp-settings.tsx"),
route("skills", "routes/skills-settings.tsx"),
route("user", "routes/user-settings.tsx"),
diff --git a/frontend/src/routes/condenser-settings.tsx b/frontend/src/routes/condenser-settings.tsx
new file mode 100644
index 0000000000..ad0b3be6c8
--- /dev/null
+++ b/frontend/src/routes/condenser-settings.tsx
@@ -0,0 +1,15 @@
+import { SdkSectionPage } from "#/components/features/settings/sdk-settings/sdk-section-page";
+import { createPermissionGuard } from "#/utils/org/permission-guard";
+
+function CondenserSettingsScreen() {
+ return (
+ <SdkSectionPage
+ sectionKeys={["condenser"]}
+ testId="condenser-settings-screen"
+ />
+ );
+}
+
+export const clientLoader = createPermissionGuard("view_llm_settings");
+
+export default CondenserSettingsScreen;
diff --git a/frontend/src/routes/llm-settings.tsx b/frontend/src/routes/llm-settings.tsx
index fc6f0e19f5..87af945da3 100644
--- a/frontend/src/routes/llm-settings.tsx
+++ b/frontend/src/routes/llm-settings.tsx
@@ -1,38 +1,109 @@
import React from "react";
-import { useTranslation } from "react-i18next";
-import { AxiosError } from "axios";
import { useSearchParams } from "react-router";
+import { useTranslation } from "react-i18next";
import { ModelSelector } from "#/components/shared/modals/settings/model-selector";
import { createPermissionGuard } from "#/utils/org/permission-guard";
-import { useAIConfigOptions } from "#/hooks/query/use-ai-config-options";
-import { useSearchProviders } from "#/hooks/query/use-search-providers";
+import { useAgentSettingsSchema } from "#/hooks/query/use-agent-settings-schema";
import { useSettings } from "#/hooks/query/use-settings";
-import { hasAdvancedSettingsSet } from "#/utils/has-advanced-settings-set";
-import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
-import { SettingsSwitch } from "#/components/features/settings/settings-switch";
-import { StyledTooltip } from "#/components/shared/buttons/styled-tooltip";
-import QuestionCircleIcon from "#/icons/question-circle.svg?react";
-import { I18nKey } from "#/i18n/declaration";
import { SettingsInput } from "#/components/features/settings/settings-input";
import { HelpLink } from "#/ui/help-link";
-import { BrandButton } from "#/components/features/settings/brand-button";
+import { useConfig } from "#/hooks/query/use-config";
+import { KeyStatusIcon } from "#/components/features/settings/key-status-icon";
+import { useOrgTypeAndAccess } from "#/hooks/use-org-type-and-access";
+import { SettingsDropdownInput } from "#/components/features/settings/settings-dropdown-input";
+import {
+ SdkSectionHeaderProps,
+ SdkSectionPage,
+} from "#/components/features/settings/sdk-settings/sdk-section-page";
+import { I18nKey } from "#/i18n/declaration";
import {
displayErrorToast,
displaySuccessToast,
} from "#/utils/custom-toast-handlers";
-import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";
-import { SettingsDropdownInput } from "#/components/features/settings/settings-dropdown-input";
-import { useConfig } from "#/hooks/query/use-config";
-import { LlmSettingsInputsSkeleton } from "#/components/features/settings/llm-settings/llm-settings-inputs-skeleton";
-import { KeyStatusIcon } from "#/components/features/settings/key-status-icon";
-import { DEFAULT_SETTINGS } from "#/services/settings";
+import { Settings, SettingsSchema, SettingsScope } from "#/types/settings";
+import { OrgWideSettingsBadge } from "#/components/features/settings/org-wide-settings-badge";
import { extractModelAndProvider } from "#/utils/extract-model-and-provider";
-import { getProviderId } from "#/utils/map-provider";
-import { useMe } from "#/hooks/query/use-me";
-import { usePermission } from "#/hooks/organizations/use-permissions";
-import { useOrgTypeAndAccess } from "#/hooks/use-org-type-and-access";
+import {
+ inferInitialView,
+ type SettingsView,
+} from "#/utils/sdk-settings-schema";
+import { DEFAULT_SETTINGS } from "#/services/settings";
-const DEFAULT_OPENHANDS_MODEL = "openhands/claude-opus-4-5-20251101";
+const LLM_EXCLUDED_KEYS = new Set([
+ "llm.model",
+ "llm.api_key",
+ "llm.base_url",
+ "agent",
+ "tools",
+ "mcp_config",
+]);
+
+const buildModelId = (provider: string | null, model: string | null) => {
+ if (!provider || !model) return null;
+ return `${provider}/${model}`;
+};
+
+const hasSchemaField = (
+ schema: SettingsSchema | null | undefined,
+ fieldKey: string,
+) =>
+ schema?.sections.some((section) =>
+ section.fields.some((field) => field.key === fieldKey),
+ ) ?? false;
+
+const getSchemaFieldDefaultValue = (
+ schema: SettingsSchema | null | undefined,
+ fieldKey: string,
+) =>
+ schema?.sections
+ .flatMap((section) => section.fields)
+ .find((field) => field.key === fieldKey)?.default ?? null;
+
+const getSchemaFieldChoices = (
+ schema: SettingsSchema | null | undefined,
+ fieldKey: string,
+) =>
+ schema?.sections
+ .flatMap((section) => section.fields)
+ .find((field) => field.key === fieldKey)?.choices ?? [];
+
+const KNOWN_PROVIDER_DEFAULT_BASE_URLS: Partial<Record<string, Set<string>>> = {
+ openai: new Set(["https://api.openai.com", "https://api.openai.com/v1"]),
+ openhands: new Set([
+ "https://llm-proxy.app.all-hands.dev",
+ "https://llm-proxy.app.all-hands.dev/v1",
+ ]),
+ litellm_proxy: new Set([
+ "https://llm-proxy.app.all-hands.dev",
+ "https://llm-proxy.app.all-hands.dev/v1",
+ ]),
+};
+
+const normalizeBaseUrl = (baseUrl: string) => {
+ try {
+ const parsedUrl = new URL(baseUrl);
+ const normalizedPath = parsedUrl.pathname.replace(/\/+$/, "") || "";
+ return `${parsedUrl.origin}${normalizedPath}`;
+ } catch {
+ return baseUrl.trim().replace(/\/+$/, "");
+ }
+};
+
+const isProviderDefaultBaseUrl = (model: string, baseUrl: string) => {
+ const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+ const { provider } = extractModelAndProvider(model);
+
+ if (provider) {
+ const knownDefaults = KNOWN_PROVIDER_DEFAULT_BASE_URLS[provider];
+ if (knownDefaults) {
+ return knownDefaults.has(normalizedBaseUrl);
+ }
+ }
+
+ return Object.values(KNOWN_PROVIDER_DEFAULT_BASE_URLS).some((knownDefaults) =>
+ knownDefaults?.has(normalizedBaseUrl),
+ );
+};
interface OpenHandsApiKeyHelpProps {
testId: string;
@@ -53,7 +124,7 @@ function OpenHandsApiKeyHelp({ testId }: OpenHandsApiKeyHelpProps) {
<p className="text-xs">
{t(I18nKey.SETTINGS$LLM_BILLING_INFO)}{" "}
<a
- href="https://docs.all-hands.dev/usage/llms/openhands-llms"
+ href="https://docs.openhands.dev/usage/llms/openhands-llms"
rel="noreferrer noopener"
target="_blank"
className="underline underline-offset-2"
@@ -65,138 +136,54 @@ function OpenHandsApiKeyHelp({ testId }: OpenHandsApiKeyHelpProps) {
);
}
-function LlmSettingsScreen() {
+export function LlmSettingsScreen({
+ scope = "personal",
+}: {
+ scope?: SettingsScope;
+}) {
const { t } = useTranslation();
const [searchParams, setSearchParams] = useSearchParams();
- const { mutate: saveSettings, isPending } = useSaveSettings();
-
- const { data: securityAnalyzers } = useAIConfigOptions();
- const { data: providers = [] } = useSearchProviders();
- const { data: settings, isLoading, isFetching } = useSettings();
+ const { data: settings } = useSettings(scope);
+ const { data: schema } = useAgentSettingsSchema(
+ settings?.agent_settings_schema,
+ );
const { data: config } = useConfig();
- const { data: me } = useMe();
- const { hasPermission } = usePermission(me?.role ?? "member");
-
- // In OSS mode, user has full access (no permission restrictions)
- // In SaaS mode, check role-based permissions (members can only view, owners and admins can edit)
- const isOssMode = config?.app_mode === "oss";
- const isReadOnly = isOssMode ? false : !hasPermission("edit_llm_settings");
-
- // Get organization type for contextual info messages
const { isTeamOrg } = useOrgTypeAndAccess();
- const isAdminOrOwner = me?.role === "admin" || me?.role === "owner";
-
- const getLlmSettingsInfoMessage = (): I18nKey | null => {
- if (isOssMode) return null;
- if (!isTeamOrg) return null;
- return isAdminOrOwner
- ? I18nKey.SETTINGS$LLM_ADMIN_INFO
- : I18nKey.SETTINGS$LLM_MEMBER_INFO;
- };
-
- const infoMessageKey = getLlmSettingsInfoMessage();
-
- const [view, setView] = React.useState<"basic" | "advanced">("basic");
-
- const [dirtyInputs, setDirtyInputs] = React.useState({
- model: false,
- apiKey: false,
- searchApiKey: false,
- baseUrl: false,
- agent: false,
- confirmationMode: false,
- enableDefaultCondenser: false,
- securityAnalyzer: false,
- condenserMaxSize: false,
- });
-
- // Track the currently selected model to show help text
- const [currentSelectedModel, setCurrentSelectedModel] = React.useState<
- string | null
- >(null);
-
- // Track confirmation mode state to control security analyzer visibility
- const [confirmationModeEnabled, setConfirmationModeEnabled] = React.useState(
- settings?.confirmation_mode ?? DEFAULT_SETTINGS.confirmation_mode,
- );
-
- // Track selected security analyzer for form submission
- const [selectedSecurityAnalyzer, setSelectedSecurityAnalyzer] =
- React.useState(
- settings?.security_analyzer === null
- ? "none"
- : (settings?.security_analyzer ?? DEFAULT_SETTINGS.security_analyzer),
- );
const [selectedProvider, setSelectedProvider] = React.useState<string | null>(
null,
);
+ const [searchApiKey, setSearchApiKey] = React.useState("");
+ const [searchApiKeyDirty, setSearchApiKeyDirty] = React.useState(false);
+ const hasHydratedInitialPersonalSaasViewRef = React.useRef(false);
- const defaultModel = DEFAULT_OPENHANDS_MODEL;
-
- // Determine if we should hide the API key input and use OpenHands-managed key (when using OpenHands provider in SaaS mode)
- const currentModel = currentSelectedModel || settings?.llm_model;
+ const defaultModel = String(
+ (DEFAULT_SETTINGS.agent_settings?.llm as Record<string, unknown>)?.model ??
+ "",
+ );
const isSaasMode = config?.app_mode === "saas";
+ const hasAgentField = hasSchemaField(schema, "agent");
- const isOpenHandsProvider = () => {
- if (view === "basic") {
- return selectedProvider === "openhands";
- }
-
- if (view === "advanced") {
- if (dirtyInputs.model) {
- return currentModel?.startsWith("openhands/");
- }
- return settings?.llm_model?.startsWith("openhands/");
- }
-
- return false;
- };
-
- const shouldUseOpenHandsKey = isOpenHandsProvider() && isSaasMode;
-
- // Determine basic vs advanced view based on saved settings.
- // If the user's provider is not in the known providers list, or if they
- // have advanced settings configured, show the advanced view.
- React.useEffect(() => {
- if (settings) {
- const { provider } = extractModelAndProvider(settings.llm_model);
- const knownProvider =
- !provider || providers.some((p) => p.name === provider);
- const isAdvanced =
- !knownProvider ||
- hasAdvancedSettingsSet({
- ...settings,
- });
-
- setView(isAdvanced ? "advanced" : "basic");
- }
- }, [settings, providers]);
-
- // Initialize currentSelectedModel with the current settings
React.useEffect(() => {
if (settings?.llm_model) {
- setCurrentSelectedModel(settings.llm_model);
+ const { provider } = extractModelAndProvider(settings.llm_model);
+ setSelectedProvider(provider || null);
}
}, [settings?.llm_model]);
- // Update confirmation mode state when settings change
React.useEffect(() => {
- if (settings?.confirmation_mode !== undefined) {
- setConfirmationModeEnabled(settings.confirmation_mode);
- }
- }, [settings?.confirmation_mode]);
+ setSearchApiKey(settings?.search_api_key ?? "");
+ setSearchApiKeyDirty(false);
+ }, [settings?.search_api_key]);
- // Update selected security analyzer state when settings change
React.useEffect(() => {
- if (settings?.security_analyzer !== undefined) {
- setSelectedSecurityAnalyzer(settings.security_analyzer || "none");
+ if (settings && isSaasMode && scope !== "org") {
+ hasHydratedInitialPersonalSaasViewRef.current = true;
}
- }, [settings?.security_analyzer]);
+ }, [isSaasMode, scope, settings]);
- // Handle URL parameters for SaaS subscription redirects
React.useEffect(() => {
const checkout = searchParams.get("checkout");
@@ -209,435 +196,212 @@ function LlmSettingsScreen() {
}
}, [searchParams, setSearchParams, t]);
- const handleSuccessfulMutation = () => {
- displaySuccessToast(t(I18nKey.SETTINGS$SAVED_WARNING));
- setDirtyInputs({
- model: false,
- apiKey: false,
- searchApiKey: false,
- baseUrl: false,
- agent: false,
- confirmationMode: false,
- enableDefaultCondenser: false,
- securityAnalyzer: false,
- condenserMaxSize: false,
- });
- };
-
- const handleErrorMutation = (error: AxiosError) => {
- const errorMessage = retrieveAxiosErrorMessage(error);
- displayErrorToast(errorMessage || t(I18nKey.ERROR$GENERIC));
- };
-
- const basicFormAction = (formData: FormData) => {
- const providerDisplay = formData.get("llm-provider-input")?.toString();
- const provider = providerDisplay
- ? getProviderId(providerDisplay)
- : undefined;
- const model = formData.get("llm-model-input")?.toString();
- const apiKey = formData.get("llm-api-key-input")?.toString();
- const searchApiKey = formData.get("search-api-key-input")?.toString();
- const confirmationMode =
- formData.get("enable-confirmation-mode-switch")?.toString() === "on";
- const securityAnalyzer = formData
- .get("security-analyzer-input")
- ?.toString();
-
- const fullLlmModel = provider && model && `${provider}/${model}`;
-
- // Use OpenHands-managed key for OpenHands provider in SaaS mode
- const finalApiKey = shouldUseOpenHandsKey ? null : apiKey;
-
- saveSettings(
- {
- llm_model: fullLlmModel,
- llm_api_key: finalApiKey || null,
- search_api_key: searchApiKey || "",
- confirmation_mode: confirmationMode,
- security_analyzer:
- securityAnalyzer === "none"
- ? null
- : securityAnalyzer || DEFAULT_SETTINGS.security_analyzer,
-
- // reset advanced settings
- llm_base_url: DEFAULT_SETTINGS.llm_base_url,
- agent: DEFAULT_SETTINGS.agent,
- enable_default_condenser: DEFAULT_SETTINGS.enable_default_condenser,
- },
- {
- onSuccess: handleSuccessfulMutation,
- onError: handleErrorMutation,
- },
- );
- };
-
- const advancedFormAction = (formData: FormData) => {
- const model = formData.get("llm-custom-model-input")?.toString();
- const baseUrl = formData.get("base-url-input")?.toString();
- const apiKey = formData.get("llm-api-key-input")?.toString();
- const searchApiKey = formData.get("search-api-key-input")?.toString();
- const agent = formData.get("agent-input")?.toString();
- const confirmationMode =
- formData.get("enable-confirmation-mode-switch")?.toString() === "on";
- const enableDefaultCondenser =
- formData.get("enable-memory-condenser-switch")?.toString() === "on";
- const condenserMaxSizeStr = formData
- .get("condenser-max-size-input")
- ?.toString();
- const condenserMaxSizeRaw = condenserMaxSizeStr
- ? Number.parseInt(condenserMaxSizeStr, 10)
- : undefined;
- const condenserMaxSize =
- condenserMaxSizeRaw !== undefined
- ? Math.max(20, condenserMaxSizeRaw)
- : undefined;
-
- const securityAnalyzer = formData
- .get("security-analyzer-input")
- ?.toString();
-
- // Use OpenHands-managed key for OpenHands provider in SaaS mode
- const finalApiKey = shouldUseOpenHandsKey ? null : apiKey;
-
- saveSettings(
- {
- llm_model: model,
- llm_base_url: baseUrl,
- llm_api_key: finalApiKey || null,
- search_api_key: searchApiKey || "",
- agent,
- confirmation_mode: confirmationMode,
- enable_default_condenser: enableDefaultCondenser,
- condenser_max_size:
- condenserMaxSize ?? DEFAULT_SETTINGS.condenser_max_size,
- security_analyzer:
- securityAnalyzer === "none"
- ? null
- : securityAnalyzer || DEFAULT_SETTINGS.security_analyzer,
- },
- {
- onSuccess: handleSuccessfulMutation,
- onError: handleErrorMutation,
- },
- );
- };
-
- const handleToggleAdvancedSettings = (isToggled: boolean) => {
- setView(isToggled ? "advanced" : "basic");
- setDirtyInputs({
- model: false,
- apiKey: false,
- searchApiKey: false,
- baseUrl: false,
- agent: false,
- confirmationMode: false,
- enableDefaultCondenser: false,
- securityAnalyzer: false,
- condenserMaxSize: false,
- });
- };
-
- const handleModelIsDirty = (
- provider: string | null,
- model: string | null,
- ) => {
- // openai providers are special case; see ModelSelector
- // component for details
- const modelIsDirty = model !== settings?.llm_model.replace("openai/", "");
- setDirtyInputs((prev) => ({
- ...prev,
- model: modelIsDirty,
- }));
-
- // Track the currently selected model for help text display
- setCurrentSelectedModel(model);
- setSelectedProvider(provider);
- };
-
- const onDefaultValuesChanged = (
- provider: string | null,
- model: string | null,
- ) => {
- setSelectedProvider(provider);
- setCurrentSelectedModel(model);
- };
-
- const handleApiKeyIsDirty = (apiKey: string) => {
- const apiKeyIsDirty = apiKey !== "";
- setDirtyInputs((prev) => ({
- ...prev,
- apiKey: apiKeyIsDirty,
- }));
- };
-
- const handleSearchApiKeyIsDirty = (searchApiKey: string) => {
- const searchApiKeyIsDirty = searchApiKey !== settings?.search_api_key;
- setDirtyInputs((prev) => ({
- ...prev,
- searchApiKey: searchApiKeyIsDirty,
- }));
- };
-
- const handleCustomModelIsDirty = (model: string) => {
- const modelIsDirty = model !== settings?.llm_model && model !== "";
- setDirtyInputs((prev) => ({
- ...prev,
- model: modelIsDirty,
- }));
-
- // Track the currently selected model for help text display
- setCurrentSelectedModel(model);
- };
-
- const handleBaseUrlIsDirty = (baseUrl: string) => {
- const baseUrlIsDirty = baseUrl !== settings?.llm_base_url;
- setDirtyInputs((prev) => ({
- ...prev,
- baseUrl: baseUrlIsDirty,
- }));
- };
-
- const handleConfirmationModeIsDirty = (isToggled: boolean) => {
- const confirmationModeIsDirty = isToggled !== settings?.confirmation_mode;
- setDirtyInputs((prev) => ({
- ...prev,
- confirmationMode: confirmationModeIsDirty,
- }));
- setConfirmationModeEnabled(isToggled);
-
- // When confirmation mode is enabled, set default security analyzer to "llm" if not already set
- if (isToggled && !selectedSecurityAnalyzer) {
- setSelectedSecurityAnalyzer(DEFAULT_SETTINGS.security_analyzer);
- setDirtyInputs((prev) => ({
- ...prev,
- securityAnalyzer: true,
- }));
- }
- };
-
- const handleEnableDefaultCondenserIsDirty = (isToggled: boolean) => {
- const enableDefaultCondenserIsDirty =
- isToggled !== settings?.enable_default_condenser;
- setDirtyInputs((prev) => ({
- ...prev,
- enableDefaultCondenser: enableDefaultCondenserIsDirty,
- }));
- };
-
- const handleCondenserMaxSizeIsDirty = (value: string) => {
- const parsed = value ? Number.parseInt(value, 10) : undefined;
- const bounded = parsed !== undefined ? Math.max(20, parsed) : undefined;
- const condenserMaxSizeIsDirty =
- (bounded ?? DEFAULT_SETTINGS.condenser_max_size) !==
- (settings?.condenser_max_size ?? DEFAULT_SETTINGS.condenser_max_size);
- setDirtyInputs((prev) => ({
- ...prev,
- condenserMaxSize: condenserMaxSizeIsDirty,
- }));
- };
-
- const handleSecurityAnalyzerIsDirty = (securityAnalyzer: string) => {
- const securityAnalyzerIsDirty =
- securityAnalyzer !== settings?.security_analyzer;
- setDirtyInputs((prev) => ({
- ...prev,
- securityAnalyzer: securityAnalyzerIsDirty,
- }));
- };
-
- const formIsDirty = Object.values(dirtyInputs).some((isDirty) => isDirty);
-
- const getSecurityAnalyzerOptions = () => {
- const analyzers = securityAnalyzers || [];
- const orderedItems = [];
-
- // Add LLM analyzer first
- if (analyzers.includes("llm")) {
- orderedItems.push({
- key: "llm",
- label: t(I18nKey.SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT),
- });
- }
+ const infoMessageKey = React.useMemo((): I18nKey | null => {
+ if (!isSaasMode || !isTeamOrg) return null;
+ return scope === "org"
+ ? I18nKey.SETTINGS$ORG_DEFAULTS_INFO
+ : I18nKey.SETTINGS$PERSONAL_AGENT_INFO;
+ }, [isSaasMode, isTeamOrg, scope]);
+
+ const getInitialView = React.useCallback(
+ (
+ currentSettings: Settings,
+ filteredSchema: SettingsSchema,
+ ): SettingsView => {
+ if (
+ isSaasMode &&
+ scope !== "org" &&
+ !hasHydratedInitialPersonalSaasViewRef.current
+ ) {
+ return "basic";
+ }
- // Add None option second
- orderedItems.push({
- key: "none",
- label: t(I18nKey.SETTINGS$SECURITY_ANALYZER_NONE),
- });
-
- // Add any other analyzers that might exist
- analyzers.forEach((analyzer) => {
- if (!["llm", "invariant", "none"].includes(analyzer)) {
- // For unknown analyzers, use the analyzer name as fallback
- // In the future, add specific i18n keys for new analyzers
- orderedItems.push({
- key: analyzer,
- label: analyzer, // TODO: Add i18n support for new analyzers
- });
+ const schemaView = inferInitialView(currentSettings, filteredSchema);
+ if (schemaView !== "basic") {
+ return schemaView;
}
- });
- return orderedItems;
- };
+ const currentModel = currentSettings.llm_model ?? "";
+ const trimmedBaseUrl = currentSettings.llm_base_url?.trim() ?? "";
+ const hasCustomBaseUrl =
+ trimmedBaseUrl.length > 0 &&
+ !isProviderDefaultBaseUrl(currentModel, trimmedBaseUrl);
- if (!settings || isFetching) return <LlmSettingsInputsSkeleton />;
+ return hasCustomBaseUrl ? "all" : "basic";
+ },
+ [isSaasMode, scope],
+ );
- const formAction = (formData: FormData) => {
- if (view === "basic") basicFormAction(formData);
- else advancedFormAction(formData);
- };
+ const buildHeader = React.useCallback(
+ ({ values, isDisabled, view, onChange }: SdkSectionHeaderProps) => {
+ const modelValue =
+ typeof values["llm.model"] === "string" ? values["llm.model"] : "";
+ const baseUrlValue =
+ typeof values["llm.base_url"] === "string"
+ ? values["llm.base_url"]
+ : "";
+ const agentValue =
+ typeof values.agent === "string" ? values.agent : undefined;
+ const derivedProvider = modelValue
+ ? extractModelAndProvider(modelValue).provider || null
+ : null;
+ const activeProvider =
+ view === "basic"
+ ? (selectedProvider ?? derivedProvider)
+ : derivedProvider;
+ const shouldUseOpenHandsKey =
+ isSaasMode && activeProvider === "openhands";
+ const showOpenHandsApiKeyHelp = modelValue.startsWith("openhands/");
+
+ const renderApiKeyInput = (testId: string, helpTestId: string) => {
+ if (shouldUseOpenHandsKey) {
+ return null;
+ }
+
+ return (
+ <>
+ <SettingsInput
+ testId={testId}
+ label={t(I18nKey.SETTINGS_FORM$API_KEY)}
+ type="password"
+ className="w-full"
+ value={
+ typeof values["llm.api_key"] === "string"
+ ? values["llm.api_key"]
+ : ""
+ }
+ placeholder={settings?.llm_api_key_set ? "<hidden>" : ""}
+ onChange={(value) => onChange("llm.api_key", value)}
+ isDisabled={isDisabled}
+ startContent={
+ settings?.llm_api_key_set ? (
+ <KeyStatusIcon isSet={settings.llm_api_key_set} />
+ ) : undefined
+ }
+ />
+
+ <HelpLink
+ testId={helpTestId}
+ text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
+ linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
+ href="https://docs.openhands.dev/usage/local-setup#getting-an-api-key"
+ />
+ </>
+ );
+ };
+
+ const agentItems = getSchemaFieldChoices(schema, "agent").map(
+ (choice) => ({
+ key: String(choice.value),
+ label: choice.label,
+ }),
+ );
+
+ if (
+ hasAgentField &&
+ agentValue &&
+ !agentItems.some((item) => item.key === agentValue)
+ ) {
+ agentItems.unshift({ key: agentValue, label: agentValue });
+ }
- return (
- <div data-testid="llm-settings-screen" className="h-full relative">
- <form
- action={formAction}
- className="flex flex-col h-full justify-between"
- >
+ return (
<div className="flex flex-col gap-6">
- {infoMessageKey && (
+ {scope === "org" ? <OrgWideSettingsBadge /> : null}
+
+ {infoMessageKey ? (
<p
data-testid="llm-settings-info-message"
className="text-sm text-tertiary-alt"
>
{t(infoMessageKey)}
</p>
- )}
+ ) : null}
- <SettingsSwitch
- testId="advanced-settings-switch"
- defaultIsToggled={view === "advanced"}
- onToggle={handleToggleAdvancedSettings}
- isToggled={view === "advanced"}
- isDisabled={isReadOnly}
- >
- {t(I18nKey.SETTINGS$ADVANCED)}
- </SettingsSwitch>
-
- {view === "basic" && (
+ {view === "basic" ? (
<div
- data-testid="llm-settings-form-basic"
className="flex flex-col gap-6"
+ data-testid="llm-settings-form-basic"
>
- {!isLoading && !isFetching && (
- <>
- <ModelSelector
- currentModel={settings.llm_model || defaultModel}
- onChange={handleModelIsDirty}
- onDefaultValuesChanged={onDefaultValuesChanged}
- wrapperClassName="!flex-col !gap-6"
- isDisabled={isReadOnly}
- />
- {(settings.llm_model?.startsWith("openhands/") ||
- currentSelectedModel?.startsWith("openhands/")) && (
- <OpenHandsApiKeyHelp testId="openhands-api-key-help" />
- )}
- </>
- )}
+ <ModelSelector
+ currentModel={modelValue || undefined}
+ onChange={(provider, model) => {
+ setSelectedProvider(provider);
+ const nextModel = buildModelId(provider, model);
+ if (nextModel) {
+ onChange("llm.model", nextModel);
+ }
+ }}
+ wrapperClassName="!flex-col !gap-6"
+ isDisabled={isDisabled}
+ />
- {!shouldUseOpenHandsKey && (
- <>
- <SettingsInput
- testId="llm-api-key-input"
- name="llm-api-key-input"
- label={t(I18nKey.SETTINGS_FORM$API_KEY)}
- type="password"
- className="w-full max-w-[680px]"
- placeholder={settings.llm_api_key_set ? "<hidden>" : ""}
- onChange={handleApiKeyIsDirty}
- isDisabled={isReadOnly}
- startContent={
- settings.llm_api_key_set && (
- <KeyStatusIcon isSet={settings.llm_api_key_set} />
- )
- }
- />
+ {showOpenHandsApiKeyHelp ? (
+ <OpenHandsApiKeyHelp testId="openhands-api-key-help" />
+ ) : null}
- <HelpLink
- testId="llm-api-key-help-anchor"
- text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
- linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
- href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
- />
- </>
+ {renderApiKeyInput(
+ "llm-api-key-input",
+ "llm-api-key-help-anchor",
)}
</div>
- )}
-
- {view === "advanced" && (
+ ) : (
<div
- data-testid="llm-settings-form-advanced"
className="flex flex-col gap-6"
+ data-testid="llm-settings-form-advanced"
>
<SettingsInput
testId="llm-custom-model-input"
- name="llm-custom-model-input"
label={t(I18nKey.SETTINGS$CUSTOM_MODEL)}
- defaultValue={settings.llm_model || defaultModel}
- placeholder={defaultModel}
type="text"
- className="w-full max-w-[680px]"
- onChange={handleCustomModelIsDirty}
- isDisabled={isReadOnly}
+ className="w-full"
+ value={modelValue}
+ placeholder={defaultModel}
+ onChange={(value) => onChange("llm.model", value)}
+ isDisabled={isDisabled}
/>
- {(settings.llm_model?.startsWith("openhands/") ||
- currentSelectedModel?.startsWith("openhands/")) && (
+
+ {showOpenHandsApiKeyHelp ? (
<OpenHandsApiKeyHelp testId="openhands-api-key-help-2" />
- )}
+ ) : null}
<SettingsInput
testId="base-url-input"
- name="base-url-input"
label={t(I18nKey.SETTINGS$BASE_URL)}
- defaultValue={settings.llm_base_url}
- placeholder="https://api.openai.com"
type="text"
- className="w-full max-w-[680px]"
- onChange={handleBaseUrlIsDirty}
- isDisabled={isReadOnly}
+ className="w-full"
+ value={baseUrlValue}
+ placeholder="https://api.openai.com"
+ onChange={(value) => onChange("llm.base_url", value)}
+ isDisabled={isDisabled}
/>
- {!shouldUseOpenHandsKey && (
- <>
- <SettingsInput
- testId="llm-api-key-input"
- name="llm-api-key-input"
- label={t(I18nKey.SETTINGS_FORM$API_KEY)}
- type="password"
- className="w-full max-w-[680px]"
- placeholder={settings.llm_api_key_set ? "<hidden>" : ""}
- onChange={handleApiKeyIsDirty}
- isDisabled={isReadOnly}
- startContent={
- settings.llm_api_key_set && (
- <KeyStatusIcon isSet={settings.llm_api_key_set} />
- )
- }
- />
- <HelpLink
- testId="llm-api-key-help-anchor-advanced"
- text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
- linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
- href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
- />
- </>
+ {renderApiKeyInput(
+ "llm-api-key-input",
+ "llm-api-key-help-anchor-advanced",
)}
- {config?.app_mode !== "saas" && (
+ {!isSaasMode ? (
<>
<SettingsInput
testId="search-api-key-input"
- name="search-api-key-input"
label={t(I18nKey.SETTINGS$SEARCH_API_KEY)}
type="password"
- className="w-full max-w-[680px]"
- defaultValue={settings.search_api_key || ""}
- onChange={handleSearchApiKeyIsDirty}
+ className="w-full"
+ value={searchApiKey}
placeholder={t(I18nKey.API$TVLY_KEY_EXAMPLE)}
+ onChange={(value) => {
+ setSearchApiKey(value);
+ setSearchApiKeyDirty(
+ value !== (settings?.search_api_key ?? ""),
+ );
+ }}
startContent={
- settings.search_api_key_set && (
+ settings?.search_api_key_set ? (
<KeyStatusIcon isSet={settings.search_api_key_set} />
- )
+ ) : undefined
}
+ isDisabled={isDisabled}
/>
<HelpLink
@@ -646,125 +410,122 @@ function LlmSettingsScreen() {
linkText={t(I18nKey.SETTINGS$SEARCH_API_KEY_INSTRUCTIONS)}
href="https://tavily.com/"
/>
- </>
- )}
- <div className="w-full max-w-[680px]">
- <SettingsInput
- testId="condenser-max-size-input"
- name="condenser-max-size-input"
- type="number"
- min={20}
- step={1}
- label={t(I18nKey.SETTINGS$CONDENSER_MAX_SIZE)}
- defaultValue={(
- settings.condenser_max_size ??
- DEFAULT_SETTINGS.condenser_max_size
- )?.toString()}
- onChange={(value) => handleCondenserMaxSizeIsDirty(value)}
- isDisabled={isReadOnly || !settings.enable_default_condenser}
- className="w-full max-w-[680px] capitalize"
- />
- <p className="text-xs text-tertiary-alt mt-6">
- {t(I18nKey.SETTINGS$CONDENSER_MAX_SIZE_TOOLTIP)}
- </p>
- </div>
-
- <SettingsSwitch
- testId="enable-memory-condenser-switch"
- name="enable-memory-condenser-switch"
- defaultIsToggled={settings.enable_default_condenser}
- onToggle={handleEnableDefaultCondenserIsDirty}
- isDisabled={isReadOnly}
- >
- {t(I18nKey.SETTINGS$ENABLE_MEMORY_CONDENSATION)}
- </SettingsSwitch>
-
- {/* Confirmation mode and security analyzer */}
- <div className="flex items-center gap-2">
- <SettingsSwitch
- testId="enable-confirmation-mode-switch"
- name="enable-confirmation-mode-switch"
- onToggle={handleConfirmationModeIsDirty}
- defaultIsToggled={settings.confirmation_mode}
- isBeta
- isDisabled={isReadOnly}
- >
- {t(I18nKey.SETTINGS$CONFIRMATION_MODE)}
- </SettingsSwitch>
- <StyledTooltip
- content={t(I18nKey.SETTINGS$CONFIRMATION_MODE_TOOLTIP)}
- >
- <span className="text-[#9099AC] hover:text-white cursor-help">
- <QuestionCircleIcon width={16} height={16} />
- </span>
- </StyledTooltip>
- </div>
-
- {confirmationModeEnabled && (
- <>
- <div className="w-full max-w-[680px]">
+ {hasAgentField ? (
<SettingsDropdownInput
- testId="security-analyzer-input"
- name="security-analyzer-display"
- label={t(I18nKey.SETTINGS$SECURITY_ANALYZER)}
- items={getSecurityAnalyzerOptions()}
- placeholder={t(
- I18nKey.SETTINGS$SECURITY_ANALYZER_PLACEHOLDER,
- )}
- selectedKey={selectedSecurityAnalyzer || "none"}
+ testId="agent-input"
+ name="agent-input"
+ label={t(I18nKey.SETTINGS$AGENT)}
+ items={agentItems}
+ selectedKey={agentValue}
isClearable={false}
- isDisabled={isReadOnly}
onSelectionChange={(key) => {
- const newValue = key?.toString() || "";
- setSelectedSecurityAnalyzer(newValue);
- handleSecurityAnalyzerIsDirty(newValue);
- }}
- onInputChange={(value) => {
- // Handle when input is cleared
- if (!value) {
- setSelectedSecurityAnalyzer("");
- handleSecurityAnalyzerIsDirty("");
+ if (key) {
+ onChange("agent", String(key));
}
}}
+ isDisabled={isDisabled}
wrapperClassName="w-full"
/>
- {/* Hidden input to store the actual key value for form submission */}
- <input
- type="hidden"
- name="security-analyzer-input"
- value={selectedSecurityAnalyzer || ""}
- />
- </div>
- <p className="text-xs text-tertiary-alt max-w-[680px]">
- {t(I18nKey.SETTINGS$SECURITY_ANALYZER_DESCRIPTION)}
- </p>
+ ) : null}
</>
- )}
+ ) : null}
</div>
)}
</div>
+ );
+ },
+ [
+ hasAgentField,
+ infoMessageKey,
+ isSaasMode,
+ defaultModel,
+ schema,
+ searchApiKey,
+ selectedProvider,
+ settings?.llm_api_key_set,
+ settings?.search_api_key,
+ settings?.search_api_key_set,
+ t,
+ ],
+ );
- {!isReadOnly && (
- <div className="flex gap-6 p-6 justify-end">
- <BrandButton
- testId="submit-button"
- type="submit"
- variant="primary"
- isDisabled={!formIsDirty || isPending}
- >
- {!isPending && t("SETTINGS$SAVE_CHANGES")}
- {isPending && t("SETTINGS$SAVING")}
- </BrandButton>
- </div>
- )}
- </form>
- </div>
+ const buildPayload = React.useCallback(
+ (
+ basePayload: Record<string, unknown>,
+ context: {
+ values: Record<string, string | boolean>;
+ view: SettingsView;
+ },
+ ) => {
+ // basePayload is a nested dict (e.g. {llm: {model: "gpt-4"}})
+ const agentSettings = structuredClone(basePayload);
+ const topLevel: Record<string, unknown> = {};
+
+ if (!isSaasMode && searchApiKeyDirty) {
+ topLevel.search_api_key = searchApiKey.trim();
+ }
+
+ const modelValue =
+ typeof context.values["llm.model"] === "string"
+ ? context.values["llm.model"]
+ : "";
+ const derivedProvider = modelValue
+ ? extractModelAndProvider(modelValue).provider || null
+ : null;
+ const activeProvider =
+ context.view === "basic"
+ ? (selectedProvider ?? derivedProvider)
+ : derivedProvider;
+ const shouldUseOpenHandsKey =
+ isSaasMode && activeProvider === "openhands";
+
+ const llm = (agentSettings.llm ?? {}) as Record<string, unknown>;
+ if (shouldUseOpenHandsKey && llm.model !== undefined) {
+ llm.api_key = "";
+ agentSettings.llm = llm;
+ }
+
+ if (context.view === "basic") {
+ llm.base_url = getSchemaFieldDefaultValue(schema, "llm.base_url");
+ agentSettings.llm = llm;
+
+ if (!isSaasMode) {
+ topLevel.search_api_key = DEFAULT_SETTINGS.search_api_key;
+ }
+
+ if (hasAgentField) {
+ agentSettings.agent = getSchemaFieldDefaultValue(schema, "agent");
+ }
+ }
+
+ return { agent_settings: agentSettings, ...topLevel };
+ },
+ [
+ hasAgentField,
+ isSaasMode,
+ schema,
+ searchApiKey,
+ searchApiKeyDirty,
+ selectedProvider,
+ ],
+ );
+
+ return (
+ <SdkSectionPage
+ scope={scope}
+ sectionKeys={["llm", "general"]}
+ excludeKeys={LLM_EXCLUDED_KEYS}
+ header={buildHeader}
+ extraDirty={searchApiKeyDirty}
+ buildPayload={buildPayload}
+ onSaveSuccess={() => setSearchApiKeyDirty(false)}
+ getInitialView={getInitialView}
+ testId="llm-settings-screen"
+ />
);
}
-// Route protection: all roles have view_llm_settings, but this guard ensures
-// consistency with other routes and allows future restrictions if needed
export const clientLoader = createPermissionGuard("view_llm_settings");
export default LlmSettingsScreen;
diff --git a/frontend/src/routes/mcp-settings.tsx b/frontend/src/routes/mcp-settings.tsx
index 536e0f1c28..80cd96e0ea 100644
--- a/frontend/src/routes/mcp-settings.tsx
+++ b/frontend/src/routes/mcp-settings.tsx
@@ -11,9 +11,12 @@ import { MCPServerForm } from "#/components/features/settings/mcp-settings/mcp-s
import { ConfirmationModal } from "#/components/shared/modals/confirmation-modal";
import { BrandButton } from "#/components/features/settings/brand-button";
import { MCPConfig } from "#/types/settings";
+import { parseMcpConfig } from "#/utils/mcp-config";
import { createPermissionGuard } from "#/utils/org/permission-guard";
+import { Typography } from "#/ui/typography";
export const clientLoader = createPermissionGuard("manage_mcp");
+export const handle = { hideTitle: true };
type MCPServerType = "sse" | "stdio" | "shttp";
@@ -44,13 +47,10 @@ function MCPSettingsScreen() {
useState(false);
const [serverToDelete, setServerToDelete] = useState<string | null>(null);
- const mcpConfig: MCPConfig = settings?.mcp_config || {
- sse_servers: [],
- stdio_servers: [],
- shttp_servers: [],
- };
+ const mcpConfig: MCPConfig = parseMcpConfig(
+ settings?.agent_settings?.mcp_config,
+ );
- // Convert servers to a unified format for display
const allServers: MCPServerConfig[] = [
...mcpConfig.sse_servers.map((server, index) => ({
id: `sse-${index}`,
@@ -118,7 +118,6 @@ function MCPSettingsScreen() {
const handleConfirmDelete = () => {
if (serverToDelete) {
handleDeleteServer(serverToDelete);
- setServerToDelete(null);
}
};
@@ -127,67 +126,67 @@ function MCPSettingsScreen() {
setServerToDelete(null);
};
- if (isLoading) {
+ if (isLoading || !settings) {
+ return null;
+ }
+
+ if (view === "add") {
return (
- <div className="flex flex-col gap-5">
- <div className="animate-pulse">
- <div className="h-6 bg-gray-300 rounded w-1/4 mb-4" />
- <div className="h-4 bg-gray-300 rounded w-1/2 mb-8" />
- <div className="h-10 bg-gray-300 rounded w-32" />
- </div>
- </div>
+ <MCPServerForm
+ mode="add"
+ existingServers={allServers}
+ onSubmit={handleAddServer}
+ onCancel={() => setView("list")}
+ />
);
}
- return (
- <div className="flex flex-col gap-5">
- {view === "list" && (
- <>
- <BrandButton
- testId="add-mcp-server-button"
- type="button"
- variant="primary"
- onClick={() => setView("add")}
- isDisabled={isLoading}
- >
- {t(I18nKey.SETTINGS$MCP_ADD_SERVER)}
- </BrandButton>
-
- <MCPServerList
- servers={allServers}
- onEdit={handleEditClick}
- onDelete={handleDeleteClick}
- />
- </>
- )}
+ if (view === "edit" && editingServer) {
+ return (
+ <MCPServerForm
+ mode="edit"
+ server={editingServer}
+ existingServers={allServers}
+ onSubmit={handleEditServer}
+ onCancel={() => {
+ setEditingServer(null);
+ setView("list");
+ }}
+ />
+ );
+ }
- {view === "add" && (
- <MCPServerForm
- mode="add"
- existingServers={allServers}
- onSubmit={handleAddServer}
- onCancel={() => setView("list")}
- />
- )}
+ return (
+ <div className="h-full max-w-[1000px] mx-auto flex flex-col px-6 gap-6 pb-8">
+ <div className="flex justify-between items-center">
+ <div>
+ <Typography.H2 className="mb-2">
+ {t(I18nKey.SETTINGS$MCP_TITLE)}
+ </Typography.H2>
+ <Typography.Paragraph className="text-sm text-[#A3A3A3]">
+ {t(I18nKey.SETTINGS$MCP_DESCRIPTION)}
+ </Typography.Paragraph>
+ </div>
+ <BrandButton
+ type="button"
+ variant="primary"
+ onClick={() => setView("add")}
+ >
+ {t(I18nKey.SETTINGS$MCP_ADD_SERVER)}
+ </BrandButton>
+ </div>
- {view === "edit" && editingServer && (
- <MCPServerForm
- mode="edit"
- server={editingServer}
- existingServers={allServers}
- onSubmit={handleEditServer}
- onCancel={() => {
- setView("list");
- setEditingServer(null);
- }}
- />
- )}
+ <MCPServerList
+ servers={allServers}
+ onEdit={handleEditClick}
+ onDelete={handleDeleteClick}
+ />
- {confirmationModalIsVisible && (
+ {confirmationModalIsVisible && serverToDelete && (
<ConfirmationModal
text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}
- onConfirm={handleConfirmDelete}
onCancel={handleCancelDelete}
+ onConfirm={handleConfirmDelete}
/>
)}
</div>
diff --git a/frontend/src/routes/org-default-condenser-settings.tsx b/frontend/src/routes/org-default-condenser-settings.tsx
new file mode 100644
index 0000000000..958f269344
--- /dev/null
+++ b/frontend/src/routes/org-default-condenser-settings.tsx
@@ -0,0 +1,23 @@
+import { SdkSectionPage } from "#/components/features/settings/sdk-settings/sdk-section-page";
+import { OrgDefaultsBanner } from "#/components/features/settings/org-defaults-banner";
+import { createPermissionGuard } from "#/utils/org/permission-guard";
+
+const renderOrgDefaultsBanner = () => <OrgDefaultsBanner />;
+
+function OrgDefaultCondenserSettingsScreen() {
+ return (
+ <SdkSectionPage
+ scope="org"
+ sectionKeys={["condenser"]}
+ header={renderOrgDefaultsBanner}
+ testId="org-default-condenser-settings-screen"
+ />
+ );
+}
+
+export const clientLoader = createPermissionGuard(
+ "edit_llm_settings",
+ "/settings/condenser",
+);
+
+export default OrgDefaultCondenserSettingsScreen;
diff --git a/frontend/src/routes/org-default-llm-settings.tsx b/frontend/src/routes/org-default-llm-settings.tsx
new file mode 100644
index 0000000000..9bcfb0e183
--- /dev/null
+++ b/frontend/src/routes/org-default-llm-settings.tsx
@@ -0,0 +1,13 @@
+import { createPermissionGuard } from "#/utils/org/permission-guard";
+import { LlmSettingsScreen } from "./llm-settings";
+
+export const clientLoader = createPermissionGuard(
+ "edit_llm_settings",
+ "/settings",
+);
+
+function OrgDefaultLlmSettingsScreen() {
+ return <LlmSettingsScreen scope="org" />;
+}
+
+export default OrgDefaultLlmSettingsScreen;
diff --git a/frontend/src/routes/org-default-verification-settings.tsx b/frontend/src/routes/org-default-verification-settings.tsx
new file mode 100644
index 0000000000..d608473c4a
--- /dev/null
+++ b/frontend/src/routes/org-default-verification-settings.tsx
@@ -0,0 +1,22 @@
+import { OrgDefaultsBanner } from "#/components/features/settings/org-defaults-banner";
+import { createPermissionGuard } from "#/utils/org/permission-guard";
+import { VerificationSettingsScreen } from "./verification-settings";
+
+const renderOrgDefaultsBanner = () => <OrgDefaultsBanner />;
+
+function OrgDefaultVerificationSettingsScreen() {
+ return (
+ <VerificationSettingsScreen
+ scope="org"
+ renderTopContent={renderOrgDefaultsBanner}
+ testId="org-default-verification-settings-screen"
+ />
+ );
+}
+
+export const clientLoader = createPermissionGuard(
+ "edit_llm_settings",
+ "/settings/verification",
+);
+
+export default OrgDefaultVerificationSettingsScreen;
diff --git a/frontend/src/routes/verification-settings.tsx b/frontend/src/routes/verification-settings.tsx
new file mode 100644
index 0000000000..a5adbed2c3
--- /dev/null
+++ b/frontend/src/routes/verification-settings.tsx
@@ -0,0 +1,198 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { SettingsDropdownInput } from "#/components/features/settings/settings-dropdown-input";
+import { SettingsSwitch } from "#/components/features/settings/settings-switch";
+import {
+ SdkSectionHeaderProps,
+ SdkSectionPage,
+} from "#/components/features/settings/sdk-settings/sdk-section-page";
+import { OrgWideSettingsBadge } from "#/components/features/settings/org-wide-settings-badge";
+import { useSettings } from "#/hooks/query/use-settings";
+import { I18nKey } from "#/i18n/declaration";
+import { DEFAULT_SETTINGS } from "#/services/settings";
+import { SettingsScope } from "#/types/settings";
+import { createPermissionGuard } from "#/utils/org/permission-guard";
+
+const VERIFICATION_SCHEMA_EXCLUDE_KEYS = new Set([
+ "confirmation_mode",
+ "security_analyzer",
+]);
+
+function VerificationSettingsHeader({
+ scope,
+ confirmationMode,
+ securityAnalyzer,
+ isConversationSettingsDisabled,
+ onConfirmationModeChange,
+ onSecurityAnalyzerChange,
+ renderTopContent,
+}: {
+ scope: SettingsScope;
+ confirmationMode: boolean;
+ securityAnalyzer: string | null;
+ isConversationSettingsDisabled: boolean;
+ onConfirmationModeChange: (value: boolean) => void;
+ onSecurityAnalyzerChange: (value: string | null) => void;
+ renderTopContent?: () => React.ReactNode;
+}) {
+ const { t } = useTranslation();
+
+ const securityAnalyzerItems = React.useMemo(
+ () => [
+ {
+ key: "llm",
+ label: t(I18nKey.SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT),
+ },
+ {
+ key: "none",
+ label: t(I18nKey.SETTINGS$SECURITY_ANALYZER_NONE),
+ },
+ ],
+ [t],
+ );
+
+ const showSecurityAnalyzer = confirmationMode;
+
+ return (
+ <div className="flex flex-col gap-6">
+ {renderTopContent?.()}
+ {scope === "org" ? <OrgWideSettingsBadge /> : null}
+
+ <div className="flex flex-col gap-6">
+ <div className="flex flex-col gap-1.5">
+ <SettingsSwitch
+ testId="confirmation-mode-toggle"
+ isToggled={confirmationMode}
+ onToggle={onConfirmationModeChange}
+ isDisabled={isConversationSettingsDisabled}
+ >
+ {t(I18nKey.SETTINGS_FORM$ENABLE_CONFIRMATION_MODE_LABEL)}
+ </SettingsSwitch>
+ <p className="text-tertiary-alt text-xs leading-5">
+ {t(I18nKey.SETTINGS$CONFIRMATION_MODE_TOOLTIP)}
+ </p>
+ </div>
+
+ {showSecurityAnalyzer ? (
+ <div className="flex flex-col gap-1.5">
+ <SettingsDropdownInput
+ testId="security-analyzer-input"
+ name="security_analyzer"
+ label={t(I18nKey.SETTINGS_FORM$SECURITY_ANALYZER_LABEL)}
+ items={securityAnalyzerItems}
+ selectedKey={securityAnalyzer ?? undefined}
+ placeholder={t(I18nKey.SETTINGS$SECURITY_ANALYZER_PLACEHOLDER)}
+ isDisabled={isConversationSettingsDisabled}
+ onSelectionChange={(key) =>
+ onSecurityAnalyzerChange(key ? String(key) : null)
+ }
+ />
+ <p className="text-tertiary-alt text-xs leading-5 max-w-[680px] ">
+ {t(I18nKey.SETTINGS$SECURITY_ANALYZER_DESCRIPTION)}
+ </p>
+ </div>
+ ) : null}
+ </div>
+ </div>
+ );
+}
+
+export function VerificationSettingsScreen({
+ scope = "personal",
+ renderTopContent,
+ testId = "verification-settings-screen",
+}: {
+ scope?: SettingsScope;
+ renderTopContent?: () => React.ReactNode;
+ testId?: string;
+}) {
+ const { data: settings } = useSettings(scope);
+ const [confirmationMode, setConfirmationMode] = React.useState(
+ DEFAULT_SETTINGS.confirmation_mode,
+ );
+ const [securityAnalyzer, setSecurityAnalyzer] = React.useState<string | null>(
+ DEFAULT_SETTINGS.security_analyzer,
+ );
+ const [confirmationModeDirty, setConfirmationModeDirty] =
+ React.useState(false);
+ const [securityAnalyzerDirty, setSecurityAnalyzerDirty] =
+ React.useState(false);
+
+ React.useEffect(() => {
+ setConfirmationMode(
+ settings?.confirmation_mode ?? DEFAULT_SETTINGS.confirmation_mode,
+ );
+ setSecurityAnalyzer(
+ settings?.security_analyzer ?? DEFAULT_SETTINGS.security_analyzer,
+ );
+ setConfirmationModeDirty(false);
+ setSecurityAnalyzerDirty(false);
+ }, [settings?.confirmation_mode, settings?.security_analyzer]);
+
+ const buildHeader = React.useCallback(
+ ({ isDisabled }: SdkSectionHeaderProps) => (
+ <VerificationSettingsHeader
+ scope={scope}
+ confirmationMode={confirmationMode}
+ securityAnalyzer={securityAnalyzer}
+ isConversationSettingsDisabled={isDisabled}
+ onConfirmationModeChange={(value) => {
+ setConfirmationMode(value);
+ setConfirmationModeDirty(true);
+ }}
+ onSecurityAnalyzerChange={(value) => {
+ setSecurityAnalyzer(value);
+ setSecurityAnalyzerDirty(true);
+ }}
+ renderTopContent={renderTopContent}
+ />
+ ),
+ [confirmationMode, renderTopContent, scope, securityAnalyzer],
+ );
+
+ const buildPayload = React.useCallback(
+ (basePayload: Record<string, unknown>) => {
+ const payload = { ...basePayload };
+
+ if (confirmationModeDirty) {
+ payload.confirmation_mode = confirmationMode;
+ }
+ if (
+ securityAnalyzerDirty ||
+ (confirmationMode && settings?.security_analyzer !== securityAnalyzer)
+ ) {
+ payload.security_analyzer = securityAnalyzer;
+ }
+
+ return { conversation_settings: payload };
+ },
+ [
+ confirmationMode,
+ confirmationModeDirty,
+ securityAnalyzer,
+ securityAnalyzerDirty,
+ settings?.security_analyzer,
+ ],
+ );
+
+ return (
+ <SdkSectionPage
+ scope={scope}
+ settingsSource="conversation_settings"
+ sectionKeys={["verification"]}
+ excludeKeys={VERIFICATION_SCHEMA_EXCLUDE_KEYS}
+ header={buildHeader}
+ extraDirty={confirmationModeDirty || securityAnalyzerDirty}
+ buildPayload={buildPayload}
+ onSaveSuccess={() => {
+ setConfirmationModeDirty(false);
+ setSecurityAnalyzerDirty(false);
+ }}
+ testId={testId}
+ />
+ );
+}
+
+export const clientLoader = createPermissionGuard("view_llm_settings");
+
+export default VerificationSettingsScreen;
diff --git a/frontend/src/services/settings.ts b/frontend/src/services/settings.ts
index 1d2dbf3294..36e6313662 100644
--- a/frontend/src/services/settings.ts
+++ b/frontend/src/services/settings.ts
@@ -12,6 +12,7 @@ export const DEFAULT_SETTINGS: Settings = {
search_api_key_set: false,
confirmation_mode: false,
security_analyzer: "llm",
+ max_iterations: null,
remote_runtime_resource_factor: 1,
provider_tokens_set: {},
enable_default_condenser: true,
@@ -23,18 +24,41 @@ export const DEFAULT_SETTINGS: Settings = {
search_api_key: "",
is_new_user: true,
disabled_skills: [],
- max_budget_per_task: null,
- email: "",
- email_verified: true, // Default to true to avoid restricting access unnecessarily
mcp_config: {
sse_servers: [],
stdio_servers: [],
shttp_servers: [],
},
+ max_budget_per_task: null,
+ email: "",
+ email_verified: true,
git_user_name: "openhands",
git_user_email: "[email protected]",
v1_enabled: true,
sandbox_grouping_strategy: "NO_GROUPING",
+ agent_settings_schema: null,
+ agent_settings: {
+ schema_version: 1,
+ agent: "CodeActAgent",
+ llm: {
+ model: "openhands/claude-opus-4-5-20251101",
+ },
+ condenser: {
+ enabled: true,
+ max_size: 240,
+ },
+ mcp_config: {
+ sse_servers: [],
+ stdio_servers: [],
+ shttp_servers: [],
+ },
+ },
+ conversation_settings_schema: null,
+ conversation_settings: {
+ schema_version: 1,
+ confirmation_mode: false,
+ security_analyzer: "llm",
+ },
};
/**
diff --git a/frontend/src/types/org.ts b/frontend/src/types/org.ts
index 68c773d85d..e9c56a8e95 100644
--- a/frontend/src/types/org.ts
+++ b/frontend/src/types/org.ts
@@ -6,24 +6,13 @@ export interface Organization {
contact_name: string;
contact_email: string;
conversation_expiration: number;
- agent: string;
- default_max_iterations: number;
- security_analyzer: string;
- confirmation_mode: boolean;
- default_llm_model: string;
- default_llm_api_key_for_byor: string;
- default_llm_base_url: string;
remote_runtime_resource_factor: number;
- enable_default_condenser: boolean;
billing_margin: number;
enable_proactive_conversation_starters: boolean;
sandbox_base_container_image: string;
sandbox_runtime_container_image: string;
org_version: number;
- mcp_config: {
- tools: unknown[];
- settings: Record<string, unknown>;
- };
+ agent_settings?: Record<string, unknown>;
search_api_key: string | null;
sandbox_api_key: string | null;
max_budget_per_task: number;
@@ -38,11 +27,12 @@ export interface OrganizationMember {
user_id: string;
email: string;
role: OrganizationUserRole;
- llm_api_key: string;
max_iterations: number;
llm_model: string;
- llm_api_key_for_byor: string | null;
llm_base_url: string;
+
+ llm_api_key: string;
+ agent_settings?: Record<string, unknown>;
status: "active" | "invited" | "inactive";
}
diff --git a/frontend/src/types/settings.ts b/frontend/src/types/settings.ts
index 43ec4765f5..c209e94159 100644
--- a/frontend/src/types/settings.ts
+++ b/frontend/src/types/settings.ts
@@ -50,6 +50,57 @@ export type MCPConfig = {
shttp_servers: (string | MCPSHTTPServer)[];
};
+export type SettingsChoiceValue = boolean | number | string;
+
+export type SettingsChoice = {
+ label: string;
+ value: SettingsChoiceValue;
+};
+
+export type SettingsValue =
+ | boolean
+ | number
+ | string
+ | null
+ | SettingsValue[]
+ | { [key: string]: SettingsValue };
+
+export type SettingsValueType =
+ | "string"
+ | "integer"
+ | "number"
+ | "boolean"
+ | "array"
+ | "object";
+
+export type SettingProminence = "critical" | "major" | "minor";
+
+export type SettingsFieldSchema = {
+ key: string;
+ label: string;
+ description?: string | null;
+ section: string;
+ section_label: string;
+ value_type: SettingsValueType;
+ default?: SettingsValue;
+ choices: SettingsChoice[];
+ depends_on: string[];
+ prominence: SettingProminence;
+ secret: boolean;
+ required: boolean;
+};
+
+export type SettingsSectionSchema = {
+ key: string;
+ label: string;
+ fields: SettingsFieldSchema[];
+};
+
+export type SettingsSchema = {
+ model_name: string;
+ sections: SettingsSectionSchema[];
+};
+
export type SkillInfo = {
name: string;
type: string;
@@ -57,6 +108,8 @@ export type SkillInfo = {
triggers?: string[];
};
+export type SettingsScope = "personal" | "org";
+
export type Settings = {
llm_model: string;
llm_base_url: string;
@@ -67,10 +120,10 @@ export type Settings = {
search_api_key_set: boolean;
confirmation_mode: boolean;
security_analyzer: string | null;
+ max_iterations: number | null;
remote_runtime_resource_factor: number | null;
provider_tokens_set: Partial<Record<Provider, string | null>>;
enable_default_condenser: boolean;
- // Maximum number of events before the condenser runs
condenser_max_size: number | null;
enable_sound_notifications: boolean;
enable_proactive_conversation_starters: boolean;
@@ -86,5 +139,9 @@ export type Settings = {
git_user_name?: string;
git_user_email?: string;
v1_enabled?: boolean;
+ agent_settings_schema?: SettingsSchema | null;
+ agent_settings?: Record<string, SettingsValue> | null;
+ conversation_settings_schema?: SettingsSchema | null;
+ conversation_settings?: Record<string, SettingsValue> | null;
sandbox_grouping_strategy?: SandboxGroupingStrategy;
};
diff --git a/frontend/src/utils/has-advanced-settings-set.ts b/frontend/src/utils/has-advanced-settings-set.ts
index 4cb51178e4..4d9152abc5 100644
--- a/frontend/src/utils/has-advanced-settings-set.ts
+++ b/frontend/src/utils/has-advanced-settings-set.ts
@@ -1,5 +1,6 @@
import { DEFAULT_SETTINGS } from "#/services/settings";
import { Settings } from "#/types/settings";
+import { getAgentSettingValue } from "#/utils/sdk-settings-schema";
/**
* Determines if any advanced-only settings are configured.
@@ -20,19 +21,18 @@ export const hasAdvancedSettingsSet = (
return false;
}
- // Check for advanced-only settings that differ from defaults
const hasBaseUrl =
- !!settings.llm_base_url && settings.llm_base_url.trim() !== "";
+ typeof getAgentSettingValue(settings as Settings, "llm.base_url") ===
+ "string" &&
+ getAgentSettingValue(settings as Settings, "llm.base_url") !== "";
const hasCustomAgent =
- settings.agent !== undefined && settings.agent !== DEFAULT_SETTINGS.agent;
- // Default is true, so only check if explicitly disabled
- const hasDisabledCondenser = settings.enable_default_condenser === false;
- // Check if condenser size differs from default (default is 240)
+ getAgentSettingValue(settings as Settings, "agent") !==
+ getAgentSettingValue(DEFAULT_SETTINGS, "agent");
+ const hasDisabledCondenser =
+ getAgentSettingValue(settings as Settings, "condenser.enabled") === false;
const hasCustomCondenserSize =
- settings.condenser_max_size !== undefined &&
- settings.condenser_max_size !== null &&
- settings.condenser_max_size !== DEFAULT_SETTINGS.condenser_max_size;
- // Check if search API key is set (non-empty string)
+ getAgentSettingValue(settings as Settings, "condenser.max_size") !==
+ getAgentSettingValue(DEFAULT_SETTINGS, "condenser.max_size");
const hasSearchApiKey =
settings.search_api_key !== undefined &&
settings.search_api_key !== null &&
diff --git a/frontend/src/utils/mcp-config.ts b/frontend/src/utils/mcp-config.ts
new file mode 100644
index 0000000000..907e09e605
--- /dev/null
+++ b/frontend/src/utils/mcp-config.ts
@@ -0,0 +1,137 @@
+import {
+ MCPConfig,
+ MCPSSEServer,
+ MCPSHTTPServer,
+ MCPStdioServer,
+ SettingsValue,
+} from "#/types/settings";
+
+const EMPTY_MCP_CONFIG: MCPConfig = {
+ sse_servers: [],
+ stdio_servers: [],
+ shttp_servers: [],
+};
+
+type SdkMcpServerConfig = Record<string, SettingsValue>;
+type SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };
+
+/**
+ * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it
+ * to the frontend MCPConfig format used by UI components.
+ */
+export function parseMcpConfig(value: unknown): MCPConfig {
+ if (!value || typeof value !== "object") {
+ return { ...EMPTY_MCP_CONFIG };
+ }
+
+ const obj = value as Record<string, unknown>;
+
+ if (
+ !("mcpServers" in obj) ||
+ !obj.mcpServers ||
+ typeof obj.mcpServers !== "object"
+ ) {
+ return { ...EMPTY_MCP_CONFIG };
+ }
+
+ const sseServers: (string | MCPSSEServer)[] = [];
+ const stdioServers: MCPStdioServer[] = [];
+ const shttpServers: (string | MCPSHTTPServer)[] = [];
+
+ const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;
+
+ for (const [serverName, serverConfig] of Object.entries(mcpServers)) {
+ // eslint-disable-next-line no-continue
+ if (!serverConfig || typeof serverConfig !== "object") continue;
+
+ const url = serverConfig.url as string | undefined;
+
+ if (url) {
+ const transport = serverConfig.transport as string | undefined;
+ const auth = serverConfig.auth as string | undefined;
+ const apiKey =
+ typeof auth === "string" && auth !== "oauth" ? auth : undefined;
+
+ if (transport === "sse") {
+ const server: MCPSSEServer = { url };
+ if (apiKey) server.api_key = apiKey;
+ sseServers.push(server);
+ } else {
+ const server: MCPSHTTPServer = { url };
+ if (apiKey) server.api_key = apiKey;
+ if (serverConfig.timeout != null) {
+ server.timeout = serverConfig.timeout as number;
+ }
+ shttpServers.push(server);
+ }
+ } else {
+ const stdioServer: MCPStdioServer = {
+ name: serverName,
+ command: serverConfig.command as string,
+ };
+ if (serverConfig.args) {
+ stdioServer.args = serverConfig.args as string[];
+ }
+ if (serverConfig.env) {
+ stdioServer.env = serverConfig.env as Record<string, string>;
+ }
+ stdioServers.push(stdioServer);
+ }
+ }
+
+ return {
+ sse_servers: sseServers,
+ stdio_servers: stdioServers,
+ shttp_servers: shttpServers,
+ };
+}
+
+/**
+ * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }
+ * shape expected by agent_settings.mcp_config on the backend.
+ */
+export function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {
+ const mcpServers: Record<string, SdkMcpServerConfig> = {};
+ let counter = 0;
+
+ const nextName = (base: string): string => {
+ const name = counter === 0 ? base : `${base}_${counter}`;
+ counter += 1;
+ return name;
+ };
+
+ for (const entry of config.sse_servers) {
+ const server: SdkMcpServerConfig = {};
+ if (typeof entry === "string") {
+ server.url = entry;
+ } else {
+ server.url = entry.url;
+ if (entry.api_key) server.auth = entry.api_key;
+ }
+ server.transport = "sse";
+ mcpServers[nextName("sse")] = server;
+ }
+
+ for (const entry of config.shttp_servers) {
+ const server: SdkMcpServerConfig = {};
+ if (typeof entry === "string") {
+ server.url = entry;
+ } else {
+ server.url = entry.url;
+ if (entry.api_key) server.auth = entry.api_key;
+ if (entry.timeout != null) server.timeout = entry.timeout;
+ }
+ mcpServers[nextName("shttp")] = server;
+ }
+
+ for (const entry of config.stdio_servers) {
+ const server: SdkMcpServerConfig = {
+ command: entry.command,
+ };
+ if (entry.args) server.args = entry.args;
+ if (entry.env) server.env = entry.env;
+ mcpServers[nextName(entry.name || "stdio")] = server;
+ }
+
+ return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;
+}
diff --git a/frontend/src/utils/sdk-settings-field-metadata.test.ts b/frontend/src/utils/sdk-settings-field-metadata.test.ts
new file mode 100644
index 0000000000..bf8f39d31c
--- /dev/null
+++ b/frontend/src/utils/sdk-settings-field-metadata.test.ts
@@ -0,0 +1,321 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import type { TFunction } from "i18next";
+import {
+ toSchemaTranslationKey,
+ resolveSchemaFieldLabel,
+ resolveSchemaFieldDescription,
+ resolveSchemaFieldSectionLabel,
+ resolveSchemaChoiceLabel,
+ getSettingsFieldConstraints,
+} from "./sdk-settings-field-metadata";
+
+// Mock console.warn to suppress warnings during tests and allow verification
+const originalWarn = console.warn;
+let warnSpy: ReturnType<typeof vi.spyOn>;
+
+beforeEach(() => {
+ warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+});
+
+afterEach(() => {
+ warnSpy.mockRestore();
+ console.warn = originalWarn;
+});
+
+describe("toSchemaTranslationKey", () => {
+ it("generates correct key for simple field", () => {
+ expect(toSchemaTranslationKey("agent", "LABEL")).toBe("SCHEMA$AGENT$LABEL");
+ });
+
+ it("generates correct key for nested field", () => {
+ expect(toSchemaTranslationKey("llm.api_key", "LABEL")).toBe(
+ "SCHEMA$LLM$API_KEY$LABEL",
+ );
+ });
+
+ it("generates correct key for deeply nested field", () => {
+ expect(toSchemaTranslationKey("llm.draft.model", "DESCRIPTION")).toBe(
+ "SCHEMA$LLM$DRAFT$MODEL$DESCRIPTION",
+ );
+ });
+
+ it("generates correct key for section label", () => {
+ expect(toSchemaTranslationKey("llm", "SECTION_LABEL")).toBe(
+ "SCHEMA$LLM$SECTION_LABEL",
+ );
+ });
+});
+
+describe("resolveSchemaFieldLabel", () => {
+ it("returns translated value when conventional key exists", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$LLM$API_KEY$LABEL") return "Translated API Key";
+ return options?.defaultValue ?? key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaFieldLabel(mockT, "llm.api_key", "API Key");
+ expect(result).toBe("Translated API Key");
+ });
+
+ it("returns schema value when no translation exists", () => {
+ const mockT = vi.fn(
+ (key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? key,
+ ) as unknown as TFunction;
+
+ const result = resolveSchemaFieldLabel(
+ mockT,
+ "unknown.field",
+ "Fallback Label",
+ );
+ expect(result).toBe("Fallback Label");
+ });
+
+ it("uses explicit translation key when provided in schema", () => {
+ const mockT = vi.fn((key: string) => {
+ if (key === "CUSTOM$KEY") return "Custom Translation";
+ return key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaFieldLabel(mockT, "some.field", "CUSTOM$KEY");
+ expect(result).toBe("Custom Translation");
+ expect(mockT).toHaveBeenCalledWith("CUSTOM$KEY");
+ });
+});
+
+describe("resolveSchemaFieldDescription", () => {
+ it("returns translated description when conventional key exists", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$LLM$TEMPERATURE$DESCRIPTION")
+ return "Translated description";
+ return options?.defaultValue ?? "";
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaFieldDescription(
+ mockT,
+ "llm.temperature",
+ "Original desc",
+ );
+ expect(result).toBe("Translated description");
+ });
+
+ it("returns schema value when no translation exists", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ const result = resolveSchemaFieldDescription(
+ mockT,
+ "unknown.field",
+ "Fallback Description",
+ );
+ expect(result).toBe("Fallback Description");
+ });
+
+ it("returns null when no description provided and no translation", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ const result = resolveSchemaFieldDescription(mockT, "some.field", null);
+ expect(result).toBeNull();
+ });
+
+ it("uses explicit translation key when provided in schema", () => {
+ const mockT = vi.fn((key: string) => {
+ if (key === "CUSTOM$DESC") return "Custom Description";
+ return "";
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaFieldDescription(
+ mockT,
+ "some.field",
+ "CUSTOM$DESC",
+ );
+ expect(result).toBe("Custom Description");
+ });
+});
+
+describe("resolveSchemaFieldSectionLabel", () => {
+ it("returns translated section label when conventional key exists", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$LLM$SECTION_LABEL") return "Language Model";
+ return options?.defaultValue ?? key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaFieldSectionLabel(mockT, "llm", "LLM");
+ expect(result).toBe("Language Model");
+ });
+
+ it("returns schema value when no translation exists", () => {
+ const mockT = vi.fn(
+ (key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? key,
+ ) as unknown as TFunction;
+
+ const result = resolveSchemaFieldSectionLabel(
+ mockT,
+ "custom_section",
+ "Custom Section",
+ );
+ expect(result).toBe("Custom Section");
+ });
+});
+
+describe("resolveSchemaChoiceLabel", () => {
+ it("returns translated choice label when conventional key exists", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$LLM$REASONING_EFFORT$CHOICE$HIGH") return "Hoch";
+ return options?.defaultValue ?? key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaChoiceLabel(
+ mockT,
+ "llm.reasoning_effort",
+ "high",
+ "High",
+ );
+ expect(result).toBe("Hoch");
+ });
+
+ it("returns schema value when no translation exists", () => {
+ const mockT = vi.fn(
+ (key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? key,
+ ) as unknown as TFunction;
+
+ const result = resolveSchemaChoiceLabel(
+ mockT,
+ "some.field",
+ "option1",
+ "Option 1",
+ );
+ expect(result).toBe("Option 1");
+ });
+
+ it("handles boolean choice values", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$CONFIRMATION_MODE$CHOICE$TRUE") return "Enabled";
+ return options?.defaultValue ?? key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaChoiceLabel(
+ mockT,
+ "confirmation_mode",
+ true,
+ "Yes",
+ );
+ expect(result).toBe("Enabled");
+ });
+
+ it("handles numeric choice values", () => {
+ const mockT = vi.fn((key: string, options?: { defaultValue: string }) => {
+ if (key === "SCHEMA$PRIORITY$CHOICE$1") return "Low Priority";
+ return options?.defaultValue ?? key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaChoiceLabel(mockT, "priority", 1, "Low");
+ expect(result).toBe("Low Priority");
+ });
+
+ it("uses explicit translation key when provided in schema", () => {
+ const mockT = vi.fn((key: string) => {
+ if (key === "CUSTOM$CHOICE$KEY") return "Custom Choice";
+ return key;
+ }) as unknown as TFunction;
+
+ const result = resolveSchemaChoiceLabel(
+ mockT,
+ "some.field",
+ "value",
+ "CUSTOM$CHOICE$KEY",
+ );
+ expect(result).toBe("Custom Choice");
+ });
+});
+
+describe("getSettingsFieldConstraints", () => {
+ it("returns constraints for known fields", () => {
+ const constraints = getSettingsFieldConstraints("llm.top_p");
+ expect(constraints).toEqual({
+ min: 0,
+ max: 1,
+ step: 0.01,
+ });
+ });
+
+ it("returns undefined for unknown fields", () => {
+ const constraints = getSettingsFieldConstraints("unknown.field");
+ expect(constraints).toBeUndefined();
+ });
+});
+
+describe("warning logging", () => {
+ it("logs warning when falling back to schema value for label", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ resolveSchemaFieldLabel(mockT, "unknown.field", "Fallback Label");
+
+ expect(warnSpy).toHaveBeenCalledWith(
+ '[i18n] Missing translation for key "SCHEMA$UNKNOWN$FIELD$LABEL", falling back to: "Fallback Label"',
+ );
+ });
+
+ it("logs warning when falling back to schema value for description", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ resolveSchemaFieldDescription(
+ mockT,
+ "unknown.field",
+ "Fallback Description",
+ );
+
+ expect(warnSpy).toHaveBeenCalledWith(
+ '[i18n] Missing translation for key "SCHEMA$UNKNOWN$FIELD$DESCRIPTION", falling back to: "Fallback Description"',
+ );
+ });
+
+ it("logs warning when falling back to schema value for choice label", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ resolveSchemaChoiceLabel(mockT, "some.field", "option1", "Option 1");
+
+ expect(warnSpy).toHaveBeenCalledWith(
+ '[i18n] Missing translation for key "SCHEMA$SOME$FIELD$CHOICE$OPTION1", falling back to: "Option 1"',
+ );
+ });
+
+ it("does not log warning when translation is found", () => {
+ const mockT = vi.fn((key: string) => {
+ if (key === "SCHEMA$LLM$API_KEY$LABEL") return "Translated API Key";
+ return "";
+ }) as unknown as TFunction;
+
+ resolveSchemaFieldLabel(mockT, "llm.api_key", "API Key");
+
+ expect(warnSpy).not.toHaveBeenCalled();
+ });
+
+ it("does not log warning when description is null/undefined", () => {
+ const mockT = vi.fn(
+ (_key: string, options?: { defaultValue: string }) =>
+ options?.defaultValue ?? "",
+ ) as unknown as TFunction;
+
+ resolveSchemaFieldDescription(mockT, "some.field", null);
+ resolveSchemaFieldDescription(mockT, "some.field", undefined);
+
+ expect(warnSpy).not.toHaveBeenCalled();
+ });
+});
diff --git a/frontend/src/utils/sdk-settings-field-metadata.ts b/frontend/src/utils/sdk-settings-field-metadata.ts
new file mode 100644
index 0000000000..7f62c3ab89
--- /dev/null
+++ b/frontend/src/utils/sdk-settings-field-metadata.ts
@@ -0,0 +1,171 @@
+import type { TFunction } from "i18next";
+
+export interface SettingsFieldConstraints {
+ min?: number;
+ max?: number;
+ step?: number;
+}
+
+interface SettingsFieldMetadata {
+ constraints?: SettingsFieldConstraints;
+}
+
+/**
+ * Generates a conventional i18n translation key from a schema field key.
+ *
+ * Convention: SCHEMA$<SECTION>$<FIELD_NAME>$<ATTRIBUTE>
+ * Examples:
+ * - "llm.api_key" + "LABEL" → "SCHEMA$LLM$API_KEY$LABEL"
+ * - "agent" + "DESCRIPTION" → "SCHEMA$AGENT$DESCRIPTION"
+ * - "llm" + "SECTION_LABEL" → "SCHEMA$LLM$SECTION_LABEL"
+ *
+ * This follows Rails-style i18n conventions where translation keys are
+ * derived from model/attribute names using a predictable pattern.
+ */
+export function toSchemaTranslationKey(
+ fieldKey: string,
+ attribute: "LABEL" | "DESCRIPTION" | "SECTION_LABEL",
+): string {
+ const normalizedKey = fieldKey.replace(/\./g, "$").toUpperCase();
+ return `SCHEMA$${normalizedKey}$${attribute}`;
+}
+
+const looksLikeTranslationKey = (value: string | null | undefined) =>
+ Boolean(value?.includes("$"));
+
+/**
+ * Field-specific constraints (min/max/step for numeric inputs).
+ * Labels and descriptions are now handled via convention-based i18n keys.
+ */
+const FIELD_METADATA: Record<string, SettingsFieldMetadata> = {
+ "llm.top_p": {
+ constraints: {
+ min: 0,
+ max: 1,
+ step: 0.01,
+ },
+ },
+ "llm.temperature": {
+ constraints: {
+ min: 0,
+ max: 2,
+ step: 0.1,
+ },
+ },
+};
+
+export function getSettingsFieldConstraints(fieldKey: string) {
+ return FIELD_METADATA[fieldKey]?.constraints;
+}
+
+/**
+ * Common resolver for schema field text (labels and descriptions).
+ * Uses the i18n fallback chain:
+ * 1. If schema provides an explicit translation key (contains $), use it directly
+ * 2. Try the conventional key (SCHEMA$<PATH>$<ATTRIBUTE>)
+ * 3. Fall back to the schema-provided value (untranslated)
+ *
+ * Logs a warning if no translation is found and falling back to schema value.
+ */
+function resolveSchemaFieldText(
+ t: TFunction,
+ fieldKey: string,
+ attribute: "LABEL" | "DESCRIPTION" | "SECTION_LABEL",
+ schemaValue: string | null | undefined,
+): string | null {
+ // If schema already provides a translation key, use it
+ if (looksLikeTranslationKey(schemaValue)) {
+ return t(schemaValue as string);
+ }
+
+ // Try conventional key
+ const conventionalKey = toSchemaTranslationKey(fieldKey, attribute);
+ const translated = t(conventionalKey, { defaultValue: "" });
+
+ // If we got a translation, use it
+ if (translated) {
+ return translated;
+ }
+
+ // Log warning when falling back to untranslated schema value
+ if (schemaValue) {
+ // eslint-disable-next-line no-console
+ console.warn(
+ `[i18n] Missing translation for key "${conventionalKey}", falling back to: "${schemaValue}"`,
+ );
+ }
+
+ return schemaValue ?? null;
+}
+
+/**
+ * Resolves a field label using the i18n fallback chain.
+ * @see resolveSchemaFieldText for the fallback chain details.
+ */
+export function resolveSchemaFieldLabel(
+ t: TFunction,
+ fieldKey: string,
+ schemaValue: string,
+): string {
+ return resolveSchemaFieldText(t, fieldKey, "LABEL", schemaValue) ?? "";
+}
+
+/**
+ * Resolves a field description using the i18n fallback chain.
+ * @see resolveSchemaFieldText for the fallback chain details.
+ */
+export function resolveSchemaFieldDescription(
+ t: TFunction,
+ fieldKey: string,
+ schemaValue?: string | null,
+): string | null {
+ return resolveSchemaFieldText(t, fieldKey, "DESCRIPTION", schemaValue);
+}
+
+/**
+ * Resolves a section label using the i18n fallback chain.
+ * @see resolveSchemaFieldText for the fallback chain details.
+ */
+export function resolveSchemaFieldSectionLabel(
+ t: TFunction,
+ sectionKey: string,
+ schemaValue: string,
+): string {
+ return (
+ resolveSchemaFieldText(t, sectionKey, "SECTION_LABEL", schemaValue) ?? ""
+ );
+}
+
+/**
+ * Resolves a choice label for select fields using the i18n fallback chain.
+ * Convention: SCHEMA$<FIELD_PATH>$CHOICE$<CHOICE_VALUE>
+ *
+ * Logs a warning if no translation is found and falling back to schema label.
+ */
+export function resolveSchemaChoiceLabel(
+ t: TFunction,
+ fieldKey: string,
+ choiceValue: string | number | boolean,
+ schemaLabel: string,
+): string {
+ if (looksLikeTranslationKey(schemaLabel)) {
+ return t(schemaLabel);
+ }
+
+ const normalizedFieldKey = fieldKey.replace(/\./g, "$").toUpperCase();
+ const normalizedChoiceValue = String(choiceValue).toUpperCase();
+ const conventionalKey = `SCHEMA$${normalizedFieldKey}$CHOICE$${normalizedChoiceValue}`;
+ const translated = t(conventionalKey, { defaultValue: "" });
+
+ if (translated) {
+ return translated;
+ }
+
+ // Log warning when falling back to untranslated schema label
+ // eslint-disable-next-line no-console
+ console.warn(
+ `[i18n] Missing translation for key "${conventionalKey}", falling back to: "${schemaLabel}"`,
+ );
+
+ return schemaLabel;
+}
diff --git a/frontend/src/utils/sdk-settings-schema.ts b/frontend/src/utils/sdk-settings-schema.ts
new file mode 100644
index 0000000000..89907584ea
--- /dev/null
+++ b/frontend/src/utils/sdk-settings-schema.ts
@@ -0,0 +1,460 @@
+import {
+ SettingProminence,
+ Settings,
+ SettingsFieldSchema,
+ SettingsSchema,
+ SettingsSectionSchema,
+ SettingsValue,
+} from "#/types/settings";
+import { getSettingsFieldConstraints } from "#/utils/sdk-settings-field-metadata";
+
+export type SettingsFormValues = Record<string, string | boolean>;
+export type SettingsDirtyState = Record<string, boolean>;
+export type SdkSettingsPayload = Record<string, SettingsValue>;
+export type SettingsValueSource = "agent_settings" | "conversation_settings";
+
+export type SettingsView = "basic" | "advanced" | "all";
+
+/** Fields that are rendered by purpose-built components instead of the
+ * generic `SchemaField` renderer. */
+export const SPECIALLY_RENDERED_KEYS = new Set([
+ "llm.model",
+ "llm.api_key",
+ "llm.base_url",
+]);
+
+/** Prominence tiers visible at each view level. */
+const VIEW_PROMINENCES: Record<SettingsView, Set<SettingProminence>> = {
+ basic: new Set<SettingProminence>(["critical"]),
+ advanced: new Set<SettingProminence>(["critical", "major"]),
+ all: new Set<SettingProminence>(["critical", "major", "minor"]),
+};
+
+function getSchemaFields(schema: SettingsSchema): SettingsFieldSchema[] {
+ return schema.sections.flatMap((section) => section.fields);
+}
+
+/** Traverse a nested object using a dotted key path (e.g. "llm.model"). */
+function lookupDotted(
+ obj: Record<string, unknown> | null | undefined,
+ key: string,
+): unknown {
+ if (!obj) return undefined;
+ const parts = key.split(".");
+ let current: unknown = obj;
+ for (const part of parts) {
+ if (current == null || typeof current !== "object") return undefined;
+ current = (current as Record<string, unknown>)[part];
+ }
+ return current;
+}
+
+/** Set a value in a nested object at a dotted key path (e.g. "llm.model"). */
+function setDotted(
+ obj: Record<string, unknown>,
+ key: string,
+ value: unknown,
+): void {
+ const parts = key.split(".");
+ let current: Record<string, unknown> = obj;
+ for (let i = 0; i < parts.length - 1; i += 1) {
+ const part = parts[i];
+ if (
+ current[part] == null ||
+ typeof current[part] !== "object" ||
+ Array.isArray(current[part])
+ ) {
+ current[part] = {};
+ }
+ current = current[part] as Record<string, unknown>;
+ }
+ current[parts[parts.length - 1]] = value;
+}
+
+export function getSettingValue(
+ settings: Settings,
+ key: string,
+ source: SettingsValueSource = "agent_settings",
+): SettingsValue {
+ return (lookupDotted(settings[source] as Record<string, unknown>, key) ??
+ null) as SettingsValue;
+}
+
+export function getAgentSettingValue(
+ settings: Settings,
+ key: string,
+): SettingsValue {
+ return getSettingValue(settings, key, "agent_settings");
+}
+
+export function getConversationSettingValue(
+ settings: Settings,
+ key: string,
+): SettingsValue {
+ return getSettingValue(settings, key, "conversation_settings");
+}
+
+function isChoiceField(field: SettingsFieldSchema): boolean {
+ return field.choices.length > 0;
+}
+
+function isCriticalField(field: SettingsFieldSchema): boolean {
+ return field.prominence === "critical";
+}
+
+function isMinorField(field: SettingsFieldSchema): boolean {
+ return field.prominence === "minor";
+}
+
+function normalizeFieldValue(
+ field: SettingsFieldSchema,
+ rawValue: unknown,
+): string | boolean {
+ const resolvedValue = rawValue ?? field.default;
+
+ if (isChoiceField(field)) {
+ return resolvedValue === null || resolvedValue === undefined
+ ? ""
+ : String(resolvedValue);
+ }
+
+ if (field.value_type === "boolean") {
+ return Boolean(resolvedValue ?? false);
+ }
+
+ if (resolvedValue === null || resolvedValue === undefined) {
+ return "";
+ }
+
+ if (field.value_type === "array" || field.value_type === "object") {
+ return JSON.stringify(resolvedValue, null, 2);
+ }
+
+ return String(resolvedValue);
+}
+
+function normalizeComparableValue(
+ field: SettingsFieldSchema,
+ rawValue: unknown,
+): boolean | number | string | null {
+ if (rawValue === undefined) {
+ return null;
+ }
+
+ if (field.value_type === "boolean") {
+ if (typeof rawValue === "string") {
+ if (rawValue === "true") {
+ return true;
+ }
+ if (rawValue === "false") {
+ return false;
+ }
+ }
+ if (rawValue === null) {
+ return null;
+ }
+ return Boolean(rawValue);
+ }
+
+ if (field.value_type === "integer" || field.value_type === "number") {
+ if (rawValue === "" || rawValue === null) {
+ return null;
+ }
+
+ const parsedValue =
+ typeof rawValue === "number" ? rawValue : Number(String(rawValue));
+ return Number.isNaN(parsedValue) ? null : parsedValue;
+ }
+
+ if (field.value_type === "array" || field.value_type === "object") {
+ if (rawValue === null) {
+ return null;
+ }
+
+ // Treat empty objects as null so that serializer artifacts
+ // (e.g. mcp_config: {} vs schema default null) don't trigger
+ // a spurious view escalation in inferInitialView.
+ if (
+ field.value_type === "object" &&
+ typeof rawValue === "object" &&
+ !Array.isArray(rawValue) &&
+ Object.keys(rawValue as Record<string, unknown>).length === 0
+ ) {
+ return null;
+ }
+
+ if (typeof rawValue === "string") {
+ const trimmedValue = rawValue.trim();
+ if (!trimmedValue) {
+ return null;
+ }
+ try {
+ const parsed: unknown = JSON.parse(trimmedValue);
+ // Also normalise stringified empty objects
+ if (
+ field.value_type === "object" &&
+ parsed !== null &&
+ typeof parsed === "object" &&
+ !Array.isArray(parsed) &&
+ Object.keys(parsed as Record<string, unknown>).length === 0
+ ) {
+ return null;
+ }
+ return JSON.stringify(parsed);
+ } catch {
+ return trimmedValue;
+ }
+ }
+
+ return JSON.stringify(rawValue);
+ }
+
+ if (rawValue === null) {
+ return null;
+ }
+
+ return String(rawValue);
+}
+
+export function buildInitialSettingsFormValues(
+ settings: Settings,
+ schemaOverride?: SettingsSchema | null,
+ source: SettingsValueSource = "agent_settings",
+): SettingsFormValues {
+ const schema =
+ schemaOverride ??
+ (source === "conversation_settings"
+ ? settings.conversation_settings_schema
+ : settings.agent_settings_schema);
+ if (!schema) {
+ return {};
+ }
+
+ return Object.fromEntries(
+ getSchemaFields(schema).map((field) => [
+ field.key,
+ normalizeFieldValue(field, getSettingValue(settings, field.key, source)),
+ ]),
+ );
+}
+
+export function inferInitialView(
+ settings: Settings,
+ schemaOverride?: SettingsSchema | null,
+ source: SettingsValueSource = "agent_settings",
+): SettingsView {
+ const schema =
+ schemaOverride ??
+ (source === "conversation_settings"
+ ? settings.conversation_settings_schema
+ : settings.agent_settings_schema);
+ if (!schema) {
+ return "basic";
+ }
+
+ let hasMinorOverride = false;
+ let hasMajorOverride = false;
+
+ for (const field of getSchemaFields(schema)) {
+ if (!isCriticalField(field)) {
+ const currentValue = getSettingValue(settings, field.key, source);
+ const isDifferent =
+ normalizeComparableValue(
+ field,
+ currentValue ?? field.default ?? null,
+ ) !== normalizeComparableValue(field, field.default ?? null);
+
+ if (isDifferent) {
+ if (isMinorField(field)) {
+ hasMinorOverride = true;
+ } else {
+ hasMajorOverride = true;
+ }
+ }
+ }
+ }
+
+ if (hasMinorOverride) return "all";
+ if (hasMajorOverride) return "advanced";
+ return "basic";
+}
+
+/** Determine which view tier to default to based on whether the user has
+ * overridden any non-critical settings. */
+export function hasAdvancedSettingsOverrides(settings: Settings): boolean {
+ return inferInitialView(settings) !== "basic";
+}
+
+export function isSettingsFieldVisible(
+ field: SettingsFieldSchema,
+ values: SettingsFormValues,
+): boolean {
+ return field.depends_on.every((dependency) => values[dependency] === true);
+}
+
+function parseBooleanFieldValue(rawValue: string | boolean): boolean | null {
+ if (typeof rawValue === "boolean") {
+ return rawValue;
+ }
+
+ const normalizedValue = rawValue.trim().toLowerCase();
+ if (!normalizedValue) {
+ return null;
+ }
+ if (normalizedValue === "true") {
+ return true;
+ }
+ if (normalizedValue === "false") {
+ return false;
+ }
+
+ throw new Error(`Expected a boolean value, received: ${rawValue}`);
+}
+
+function coerceFieldValue(
+ field: SettingsFieldSchema,
+ rawValue: string | boolean,
+): SettingsValue {
+ if (field.value_type === "boolean") {
+ return parseBooleanFieldValue(rawValue);
+ }
+
+ if (field.value_type === "integer" || field.value_type === "number") {
+ const stringValue = String(rawValue).trim();
+ if (!stringValue) {
+ return null;
+ }
+
+ const parsedValue = Number(stringValue);
+ if (Number.isNaN(parsedValue)) {
+ throw new Error(`Expected a numeric value, received: ${stringValue}`);
+ }
+ if (field.value_type === "integer" && !Number.isInteger(parsedValue)) {
+ throw new Error(`Expected an integer value, received: ${stringValue}`);
+ }
+
+ const constraints = getSettingsFieldConstraints(field.key);
+ if (constraints?.min != null && parsedValue < constraints.min) {
+ throw new Error(`${field.label} must be at least ${constraints.min}`);
+ }
+ if (constraints?.max != null && parsedValue > constraints.max) {
+ throw new Error(`${field.label} must be at most ${constraints.max}`);
+ }
+
+ return parsedValue;
+ }
+
+ if (field.value_type === "array" || field.value_type === "object") {
+ const stringValue = String(rawValue).trim();
+ if (!stringValue) {
+ return null;
+ }
+
+ let parsedValue: unknown;
+ try {
+ parsedValue = JSON.parse(stringValue);
+ } catch {
+ throw new Error(`Invalid JSON for ${field.label}`);
+ }
+
+ if (field.value_type === "array") {
+ if (!Array.isArray(parsedValue)) {
+ throw new Error(`${field.label} must be a JSON array`);
+ }
+ return parsedValue as SettingsValue[];
+ }
+
+ if (
+ parsedValue === null ||
+ Array.isArray(parsedValue) ||
+ typeof parsedValue !== "object"
+ ) {
+ throw new Error(`${field.label} must be a JSON object`);
+ }
+
+ return parsedValue as { [key: string]: SettingsValue };
+ }
+
+ const stringValue = String(rawValue);
+ if (stringValue === "" && !field.secret) {
+ return null;
+ }
+
+ return stringValue;
+}
+
+export function buildSdkSettingsPayload(
+ schema: SettingsSchema,
+ values: SettingsFormValues,
+ dirty: SettingsDirtyState,
+): SdkSettingsPayload {
+ const payload: Record<string, unknown> = {};
+
+ for (const field of getSchemaFields(schema)) {
+ if (dirty[field.key]) {
+ setDotted(payload, field.key, coerceFieldValue(field, values[field.key]));
+ }
+ }
+
+ return payload as SdkSettingsPayload;
+}
+
+function isFieldVisibleInView(
+ field: SettingsFieldSchema,
+ view: SettingsView,
+): boolean {
+ return VIEW_PROMINENCES[view].has(field.prominence);
+}
+
+export function buildSdkSettingsPayloadForView(
+ schema: SettingsSchema,
+ values: SettingsFormValues,
+ dirty: SettingsDirtyState,
+ view: SettingsView,
+): SdkSettingsPayload {
+ const payload = buildSdkSettingsPayload(schema, values, dirty) as Record<
+ string,
+ unknown
+ >;
+
+ for (const field of getSchemaFields(schema)) {
+ if (!isFieldVisibleInView(field, view)) {
+ setDotted(payload, field.key, field.default ?? null);
+ }
+ }
+
+ return payload as SdkSettingsPayload;
+}
+
+/** Return sections with fields filtered for the current view tier.
+ * Specially-rendered fields are excluded from the generic list. */
+export function getVisibleSettingsSections(
+ schema: SettingsSchema,
+ values: SettingsFormValues,
+ view: SettingsView,
+ excludeKeys: Set<string> = SPECIALLY_RENDERED_KEYS,
+): SettingsSectionSchema[] {
+ return schema.sections
+ .map((section) => ({
+ ...section,
+ fields: section.fields.filter(
+ (field) =>
+ !excludeKeys.has(field.key) &&
+ isFieldVisibleInView(field, view) &&
+ isSettingsFieldVisible(field, values),
+ ),
+ }))
+ .filter((section) => section.fields.length > 0);
+}
+
+/** Whether the schema has any fields visible in the "advanced" tier. */
+export function hasAdvancedSettings(schema: SettingsSchema | null): boolean {
+ if (!schema) return false;
+ return getSchemaFields(schema).some((f) => f.prominence === "major");
+}
+
+/** Whether the schema has any "minor" prominence fields. */
+export function hasMinorSettings(schema: SettingsSchema | null): boolean {
+ if (!schema) return false;
+ return getSchemaFields(schema).some((f) => f.prominence === "minor");
+}
diff --git a/frontend/src/utils/settings-utils.ts b/frontend/src/utils/settings-utils.ts
index caa03e9aa7..e42d37ccef 100644
--- a/frontend/src/utils/settings-utils.ts
+++ b/frontend/src/utils/settings-utils.ts
@@ -1,52 +1,17 @@
-import { Settings } from "#/types/settings";
-import { getProviderId } from "#/utils/map-provider";
import { WebClientFeatureFlags } from "#/api/option-service/option.types";
+import { Settings, SettingsValue } from "#/types/settings";
+import { getProviderId } from "#/utils/map-provider";
const extractBasicFormData = (formData: FormData) => {
const providerDisplay = formData.get("llm-provider-input")?.toString();
const provider = providerDisplay ? getProviderId(providerDisplay) : undefined;
const model = formData.get("llm-model-input")?.toString();
- const LLM_MODEL = `${provider}/${model}`;
- const LLM_API_KEY = formData.get("llm-api-key-input")?.toString();
- const AGENT = formData.get("agent")?.toString();
- const LANGUAGE = formData.get("language")?.toString();
-
return {
- LLM_MODEL,
- LLM_API_KEY,
- AGENT,
- LANGUAGE,
- };
-};
-
-const extractAdvancedFormData = (formData: FormData) => {
- const keys = Array.from(formData.keys());
- const isUsingAdvancedOptions = keys.includes("use-advanced-options");
-
- let CUSTOM_LLM_MODEL: string | undefined;
- let LLM_BASE_URL: string | undefined;
- let CONFIRMATION_MODE = false;
- let SECURITY_ANALYZER: string | undefined;
- let ENABLE_DEFAULT_CONDENSER = true;
-
- if (isUsingAdvancedOptions) {
- CUSTOM_LLM_MODEL = formData.get("custom-model")?.toString();
- LLM_BASE_URL = formData.get("base-url")?.toString();
- CONFIRMATION_MODE = keys.includes("confirmation-mode");
- if (CONFIRMATION_MODE) {
- // only set securityAnalyzer if confirmationMode is enabled
- SECURITY_ANALYZER = formData.get("security-analyzer")?.toString();
- }
- ENABLE_DEFAULT_CONDENSER = keys.includes("enable-default-condenser");
- }
-
- return {
- CUSTOM_LLM_MODEL,
- LLM_BASE_URL,
- CONFIRMATION_MODE,
- SECURITY_ANALYZER,
- ENABLE_DEFAULT_CONDENSER,
+ llmModel: provider && model ? `${provider}/${model}` : undefined,
+ llmApiKey: formData.get("llm-api-key-input")?.toString(),
+ agent: formData.get("agent")?.toString(),
+ language: formData.get("language")?.toString(),
};
};
@@ -62,34 +27,31 @@ export const parseMaxBudgetPerTask = (value: string): number | null => {
}
const parsedValue = parseFloat(value);
- // Ensure the value is at least 1 dollar and is a finite number
return parsedValue && parsedValue >= 1 && Number.isFinite(parsedValue)
? parsedValue
: null;
};
-export const extractSettings = (formData: FormData): Partial<Settings> => {
- const { LLM_MODEL, LLM_API_KEY, AGENT, LANGUAGE } =
+export const extractSettings = (
+ formData: FormData,
+): Partial<Settings> & Record<string, unknown> => {
+ const { llmModel, llmApiKey, agent, language } =
extractBasicFormData(formData);
- const {
- CUSTOM_LLM_MODEL,
- LLM_BASE_URL,
- CONFIRMATION_MODE,
- SECURITY_ANALYZER,
- ENABLE_DEFAULT_CONDENSER,
- } = extractAdvancedFormData(formData);
+ const llm: Record<string, unknown> = {};
+ if (llmModel) llm.model = llmModel;
+ if (llmApiKey !== undefined) llm.api_key = llmApiKey;
+
+ const agentSettings: Record<string, SettingsValue> = {};
+ if (Object.keys(llm).length > 0)
+ agentSettings.llm = llm as Record<string, SettingsValue>;
+ if (agent) agentSettings.agent = agent;
return {
- llm_model: CUSTOM_LLM_MODEL || LLM_MODEL,
- llm_api_key_set: !!LLM_API_KEY,
- agent: AGENT,
- language: LANGUAGE,
- llm_base_url: LLM_BASE_URL,
- confirmation_mode: CONFIRMATION_MODE,
- security_analyzer: SECURITY_ANALYZER,
- enable_default_condenser: ENABLE_DEFAULT_CONDENSER,
- llm_api_key: LLM_API_KEY,
+ ...(Object.keys(agentSettings).length > 0
+ ? { agent_settings: agentSettings }
+ : {}),
+ ...(language ? { language } : {}),
};
};
@@ -101,7 +63,11 @@ export function isSettingsPageHidden(
path: string,
featureFlags: WebClientFeatureFlags | undefined,
): boolean {
- if (featureFlags?.hide_llm_settings && path === "/settings") return true;
+ if (
+ featureFlags?.hide_llm_settings &&
+ (path === "/settings" || path.startsWith("/settings/org-defaults"))
+ )
+ return true;
if (featureFlags?.hide_users_page && path === "/settings/user") return true;
if (featureFlags?.hide_billing_page && path === "/settings/billing")
return true;
diff --git a/frontend/src/utils/settings-value-pickers.ts b/frontend/src/utils/settings-value-pickers.ts
new file mode 100644
index 0000000000..97162ca3a2
--- /dev/null
+++ b/frontend/src/utils/settings-value-pickers.ts
@@ -0,0 +1,26 @@
+export const isNonEmptyString = (value: unknown): value is string =>
+ typeof value === "string" && value.length > 0;
+
+export const pickFirstString = (...values: unknown[]): string | undefined =>
+ values.find(isNonEmptyString);
+
+export const pickFirstBoolean = (...values: unknown[]): boolean | undefined =>
+ values.find((value): value is boolean => typeof value === "boolean");
+
+export const pickFirstNumber = (...values: unknown[]): number | undefined =>
+ values.find((value): value is number => typeof value === "number");
+
+export const pickNullableString = (
+ ...values: unknown[]
+): string | null | undefined => {
+ for (const value of values) {
+ if (typeof value === "string") {
+ return value;
+ }
+ if (value === null) {
+ return null;
+ }
+ }
+
+ return undefined;
+};
diff --git a/openhands/app_server/app_conversation/app_conversation_router.py b/openhands/app_server/app_conversation/app_conversation_router.py
index 41b7e4e12c..157c548fae 100644
--- a/openhands/app_server/app_conversation/app_conversation_router.py
+++ b/openhands/app_server/app_conversation/app_conversation_router.py
@@ -69,7 +69,7 @@ from openhands.app_server.utils.dependencies import get_dependencies
from openhands.app_server.utils.docker_utils import (
replace_localhost_hostname_for_docker,
)
-from openhands.sdk.context.skills import KeywordTrigger, TaskTrigger
+from openhands.sdk.skills import KeywordTrigger, TaskTrigger
from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
# Handle anext compatibility for Python < 3.10
diff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
index 090da5f8d0..bde771207c 100644
--- a/openhands/app_server/app_conversation/live_status_app_conversation_service.py
+++ b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
@@ -90,7 +90,7 @@ from openhands.sdk import Agent, AgentContext, LocalWorkspace
from openhands.sdk.hooks import HookConfig
from openhands.sdk.llm import LLM
from openhands.sdk.plugin import PluginSource
-from openhands.sdk.secret import LookupSecret, SecretValue, StaticSecret
+from openhands.sdk.secret import LookupSecret, StaticSecret
from openhands.sdk.utils.paging import page_iterator
from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
from openhands.server.types import AppMode
@@ -379,16 +379,6 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
)
)
- # Set security analyzer from settings
- user = await self.user_context.get_user_info()
- await self._set_security_analyzer_from_settings(
- agent_server_url,
- sandbox.session_api_key,
- info.id,
- user.security_analyzer,
- self.httpx_client,
- )
-
# Update the start task
task.status = AppConversationStartTaskStatus.READY
task.app_conversation_id = info.id
@@ -895,17 +885,34 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
Returns:
Configured LLM instance
"""
- model: str = llm_model or user.llm_model or LLM.model_fields['model'].default
- base_url = user.llm_base_url
+ model: str = (
+ llm_model
+ or user.agent_settings.llm.model
+ or LLM.model_fields['model'].default
+ )
+ base_url = user.agent_settings.llm.base_url
if model and (
model.startswith('openhands/') or model.startswith('litellm_proxy/')
):
- base_url = user.llm_base_url or self.openhands_provider_base_url
+ # The SDK auto-fills base_url with the default public proxy for
+ # openhands/ models. We need to distinguish "user explicitly set a
+ # custom URL" from "SDK auto-filled the default".
+ #
+ # Priority: user-explicit URL > deployment provider URL > SDK default
+ _SDK_DEFAULT_PROXY = 'https://llm-proxy.app.all-hands.dev/'
+ user_set_custom = base_url and base_url.rstrip(
+ '/'
+ ) != _SDK_DEFAULT_PROXY.rstrip('/')
+ if user_set_custom:
+ pass # keep user's explicit base_url
+ elif self.openhands_provider_base_url:
+ base_url = self.openhands_provider_base_url
+ # else: keep the SDK default
return LLM(
model=model,
base_url=base_url,
- api_key=user.llm_api_key,
+ api_key=user.agent_settings.llm.api_key,
usage_id='agent',
)
@@ -968,83 +975,6 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
else:
_logger.info('No search engine API key found, skipping search engine')
- def _add_custom_sse_servers(
- self, mcp_servers: dict[str, Any], sse_servers: list
- ) -> None:
- """Add custom SSE MCP servers from user configuration.
-
- Args:
- mcp_servers: Dictionary to add servers to
- sse_servers: List of SSE server configurations
- """
- for sse_server in sse_servers:
- server_config = {
- 'url': sse_server.url,
- 'transport': 'sse',
- }
- if sse_server.api_key:
- server_config['headers'] = {
- 'Authorization': f'Bearer {sse_server.api_key}'
- }
-
- # Generate unique server name using UUID
- # TODO: Let the users specify the server name
- server_name = f'sse_{uuid4().hex[:8]}'
- mcp_servers[server_name] = server_config
- _logger.debug(
- f'Added custom SSE server: {server_name} for {sse_server.url}'
- )
-
- def _add_custom_shttp_servers(
- self, mcp_servers: dict[str, Any], shttp_servers: list
- ) -> None:
- """Add custom SHTTP MCP servers from user configuration.
-
- Args:
- mcp_servers: Dictionary to add servers to
- shttp_servers: List of SHTTP server configurations
- """
- for shttp_server in shttp_servers:
- server_config = {
- 'url': shttp_server.url,
- 'transport': 'streamable-http',
- }
- if shttp_server.api_key:
- server_config['headers'] = {
- 'Authorization': f'Bearer {shttp_server.api_key}'
- }
- if shttp_server.timeout:
- server_config['timeout'] = shttp_server.timeout
-
- # Generate unique server name using UUID
- # TODO: Let the users specify the server name
- server_name = f'shttp_{uuid4().hex[:8]}'
- mcp_servers[server_name] = server_config
- _logger.debug(
- f'Added custom SHTTP server: {server_name} for {shttp_server.url}'
- )
-
- def _add_custom_stdio_servers(
- self, mcp_servers: dict[str, Any], stdio_servers: list
- ) -> None:
- """Add custom STDIO MCP servers from user configuration.
-
- Args:
- mcp_servers: Dictionary to add servers to
- stdio_servers: List of STDIO server configurations
- """
- for stdio_server in stdio_servers:
- server_config = {
- 'command': stdio_server.command,
- 'args': stdio_server.args,
- }
- if stdio_server.env:
- server_config['env'] = stdio_server.env
-
- # STDIO servers have an explicit name field
- mcp_servers[stdio_server.name] = server_config
- _logger.debug(f'Added custom STDIO server: {stdio_server.name}')
-
def _merge_custom_mcp_config(
self, mcp_servers: dict[str, Any], user: UserInfo
) -> None:
@@ -1054,27 +984,21 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
mcp_servers: Dictionary to add servers to
user: User information containing custom MCP config
"""
- if not user.mcp_config:
+ sdk_mcp = user.agent_settings.mcp_config
+ if not sdk_mcp or not sdk_mcp.mcpServers:
return
try:
- sse_count = len(user.mcp_config.sse_servers)
- shttp_count = len(user.mcp_config.shttp_servers)
- stdio_count = len(user.mcp_config.stdio_servers)
-
+ count = len(sdk_mcp.mcpServers)
_logger.info(
- f'Loading custom MCP config from user settings: '
- f'{sse_count} SSE, {shttp_count} SHTTP, {stdio_count} STDIO servers'
+ f'Loading custom MCP config from user settings: {count} servers'
)
- # Add each type of custom server
- self._add_custom_sse_servers(mcp_servers, user.mcp_config.sse_servers)
- self._add_custom_shttp_servers(mcp_servers, user.mcp_config.shttp_servers)
- self._add_custom_stdio_servers(mcp_servers, user.mcp_config.stdio_servers)
+ for name, server in sdk_mcp.mcpServers.items():
+ mcp_servers[name] = server.model_dump(exclude_none=True)
_logger.info(
- f'Successfully merged custom MCP config: added {sse_count} SSE, '
- f'{shttp_count} SHTTP, and {stdio_count} STDIO servers'
+ f'Successfully merged custom MCP config: added {count} servers'
)
except Exception as e:
@@ -1118,100 +1042,29 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
return llm, mcp_config
- def _create_agent_with_context(
- self,
- llm: LLM,
+ @staticmethod
+ def _apply_server_agent_overrides(
+ agent: Agent,
agent_type: AgentType,
- system_message_suffix: str | None,
mcp_config: dict,
- condenser_max_size: int | None,
- secrets: dict[str, SecretValue] | None = None,
- git_provider: ProviderType | None = None,
- working_dir: str | None = None,
- ) -> Agent:
- """Create an agent with appropriate tools and context based on agent type.
-
- Args:
- llm: Configured LLM instance
- agent_type: Type of agent to create (PLAN or DEFAULT)
- system_message_suffix: Optional suffix for system messages
- mcp_config: MCP configuration dictionary
- condenser_max_size: condenser_max_size setting
- secrets: Optional dictionary of secrets for authentication
- git_provider: Optional git provider type for computing plan path
- working_dir: Optional working directory for computing plan path
-
- Returns:
- Configured Agent instance with context
- """
- # Create condenser with user's settings
- condenser = self._create_condenser(llm, agent_type, condenser_max_size)
-
- # Create agent based on type
- if agent_type == AgentType.PLAN:
- # Compute plan path if working_dir is provided
- plan_path = None
- if working_dir:
- plan_path = self._compute_plan_path(working_dir, git_provider)
-
- agent = Agent(
- llm=llm,
- tools=get_planning_tools(plan_path=plan_path),
- system_prompt_filename='system_prompt_planning.j2',
- system_prompt_kwargs={'plan_structure': format_plan_structure()},
- condenser=condenser,
- mcp_config=mcp_config,
- )
- else:
- agent = Agent(
- llm=llm,
- tools=get_default_tools(enable_browser=True),
- system_prompt_kwargs={'cli_mode': False},
- condenser=condenser,
- mcp_config=mcp_config,
- )
-
- # Prepare system message suffix based on agent type
- effective_system_message_suffix = system_message_suffix
- if agent_type == AgentType.PLAN:
- # Prepend planning-specific instruction to prevent "Ready to proceed?" behavior
- if system_message_suffix:
- effective_system_message_suffix = (
- f'{PLANNING_AGENT_INSTRUCTION}\n\n{system_message_suffix}'
- )
- else:
- effective_system_message_suffix = PLANNING_AGENT_INSTRUCTION
-
- # Add agent context
- agent_context = AgentContext(
- system_message_suffix=effective_system_message_suffix, secrets=secrets
- )
- agent = agent.model_copy(update={'agent_context': agent_context})
-
- return agent
-
- def _update_agent_with_llm_metadata(
- self,
- agent: Agent,
conversation_id: UUID,
user_id: str | None,
) -> Agent:
- """Update agent's LLM and condenser LLM with litellm_extra_body metadata.
-
- This adds tracing metadata (conversation_id, user_id, etc.) to the LLM
- for analytics and debugging purposes. Only applies to openhands/ models.
+ """Apply server-only fields that have no place in ``AgentSettings``.
- Args:
- agent: The agent to update
- conversation_id: The conversation ID
- user_id: The user ID (can be None)
-
- Returns:
- Updated agent with LLM metadata
+ * System-prompt filename / kwargs (planning vs default agent).
+ * LLM tracing metadata for SaaS analytics.
"""
- updates: dict[str, Any] = {}
+ overrides: dict[str, Any] = {}
+ if agent_type == AgentType.PLAN:
+ overrides['system_prompt_filename'] = 'system_prompt_planning.j2'
+ overrides['system_prompt_kwargs'] = {
+ 'plan_structure': format_plan_structure()
+ }
+ else:
+ overrides['system_prompt_kwargs'] = {'cli_mode': False}
- # Update main LLM if it's an openhands model
+ # LLM tracing metadata for openhands/ models
if should_set_litellm_extra_body(agent.llm.model):
llm_metadata = get_llm_metadata(
model_name=agent.llm.model,
@@ -1219,33 +1072,33 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
conversation_id=conversation_id,
user_id=user_id,
)
- updated_llm = agent.llm.model_copy(
+ overrides['llm'] = agent.llm.model_copy(
update={'litellm_extra_body': {'metadata': llm_metadata}}
)
- updates['llm'] = updated_llm
- # Update condenser LLM if it exists and is an openhands model
- if agent.condenser and hasattr(agent.condenser, 'llm'):
+ # Condenser LLM tracing
+ if agent.condenser is not None and hasattr(agent.condenser, 'llm'):
condenser_llm = agent.condenser.llm
+ condenser_updates: dict[str, Any] = {}
+ if not condenser_llm.usage_id or condenser_llm.usage_id == 'agent':
+ condenser_updates['usage_id'] = 'condenser'
if should_set_litellm_extra_body(condenser_llm.model):
condenser_metadata = get_llm_metadata(
model_name=condenser_llm.model,
- llm_type=condenser_llm.usage_id or 'condenser',
+ llm_type='condenser',
conversation_id=conversation_id,
user_id=user_id,
)
- updated_condenser_llm = condenser_llm.model_copy(
- update={'litellm_extra_body': {'metadata': condenser_metadata}}
- )
+ condenser_updates['litellm_extra_body'] = {
+ 'metadata': condenser_metadata
+ }
+ if condenser_updates:
updated_condenser = agent.condenser.model_copy(
- update={'llm': updated_condenser_llm}
+ update={'llm': condenser_llm.model_copy(update=condenser_updates)}
)
- updates['condenser'] = updated_condenser
+ overrides['condenser'] = updated_condenser
- # Return updated agent if there are changes
- if updates:
- return agent.model_copy(update=updates)
- return agent
+ return agent.model_copy(update=overrides)
def _construct_initial_message_with_plugin_params(
self,
@@ -1359,42 +1212,80 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
httpx_client=self.httpx_client,
)
- async def _finalize_conversation_request(
+ async def _build_start_conversation_request_for_user(
self,
- agent: Agent,
+ sandbox: SandboxInfo,
conversation_id: UUID,
- user: UserInfo,
- workspace: LocalWorkspace,
initial_message: SendMessageRequest | None,
- secrets: dict[str, SecretValue],
- sandbox: SandboxInfo,
- remote_workspace: AsyncRemoteWorkspace | None,
- selected_repository: str | None,
+ system_message_suffix: str | None,
+ git_provider: ProviderType | None,
working_dir: str,
+ agent_type: AgentType = AgentType.DEFAULT,
+ llm_model: str | None = None,
+ remote_workspace: AsyncRemoteWorkspace | None = None,
+ selected_repository: str | None = None,
plugins: list[PluginSpec] | None = None,
) -> StartConversationRequest:
- """Finalize the conversation request with skills and metadata.
+ """Build a complete StartConversationRequest for a user.
- Args:
- agent: The configured agent
- conversation_id: Conversation ID
- user: User information
- workspace: Local workspace instance
- initial_message: Optional initial message for the conversation
- secrets: Dictionary of secrets for authentication
- sandbox: Sandbox information
- remote_workspace: Optional remote workspace for skills loading
- selected_repository: Optional repository name
- working_dir: Working directory path
- plugins: Optional list of plugin specifications to load
-
- Returns:
- Complete StartConversationRequest ready for use
+ Resolves LLM, MCP, tools, secrets and agent context, then
+ builds the ``Agent`` via ``AgentSettings.create_agent()``.
+ Server-only overrides (system prompts, LLM tracing metadata,
+ skills, hooks) are applied to the agent after creation.
+ Finally delegates to ``ConversationSettings.create_request()``.
"""
- # Update agent's LLM with litellm_extra_body metadata for tracing
- agent = self._update_agent_with_llm_metadata(agent, conversation_id, user.id)
+ user = await self.user_context.get_user_info()
+
+ project_dir = get_project_dir(working_dir, selected_repository)
+ workspace = LocalWorkspace(working_dir=project_dir)
+
+ # --- secrets --------------------------------------------------------
+ secrets = await self._setup_secrets_for_git_providers(user)
+
+ # --- LLM + MCP -----------------------------------------------------
+ llm, mcp_config = await self._configure_llm_and_mcp(
+ user, llm_model, conversation_id
+ )
+
+ # --- system_message_suffix (planning-agent prefix) ------------------
+ effective_suffix = system_message_suffix
+ if agent_type == AgentType.PLAN:
+ if system_message_suffix:
+ effective_suffix = (
+ f'{PLANNING_AGENT_INSTRUCTION}\n\n{system_message_suffix}'
+ )
+ else:
+ effective_suffix = PLANNING_AGENT_INSTRUCTION
+
+ # --- tools ----------------------------------------------------------
+ if agent_type == AgentType.PLAN:
+ plan_path = None
+ if project_dir:
+ plan_path = self._compute_plan_path(project_dir, git_provider)
+ tools = get_planning_tools(plan_path=plan_path)
+ else:
+ tools = get_default_tools(enable_browser=True)
+
+ # --- build AgentSettings and create agent ---------------------------
+ from fastmcp.mcp_config import MCPConfig
+
+ configured_agent_settings = user.agent_settings.model_copy(
+ update={
+ 'llm': llm,
+ 'tools': tools,
+ 'mcp_config': MCPConfig(**mcp_config) if mcp_config else None,
+ 'agent_context': AgentContext(
+ system_message_suffix=effective_suffix,
+ secrets=secrets,
+ ),
+ }
+ )
+ agent = configured_agent_settings.create_agent()
+ agent = self._apply_server_agent_overrides(
+ agent, agent_type, mcp_config, conversation_id, user.id
+ )
- # Load and merge skills if remote workspace is available
+ # --- skills + hooks (require remote workspace) ----------------------
hook_config: HookConfig | None = None
if remote_workspace:
try:
@@ -1403,24 +1294,19 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
agent,
remote_workspace,
selected_repository,
- working_dir,
+ project_dir,
disabled_skills=user.disabled_skills,
)
except Exception as e:
_logger.warning(f'Failed to load skills: {e}', exc_info=True)
- # Continue without skills - don't fail conversation startup
- # Load hooks from workspace (.openhands/hooks.json)
- # Note: working_dir is already the resolved project_dir
- # (includes repo name when a repo is selected), so we pass
- # it directly without appending the repo name again.
try:
_logger.debug(
f'Attempting to load hooks from workspace: '
- f'project_dir={working_dir}'
+ f'project_dir={project_dir}'
)
hook_config = await self._load_hooks_from_workspace(
- remote_workspace, working_dir
+ remote_workspace, project_dir
)
if hook_config:
_logger.debug(
@@ -1430,14 +1316,11 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
_logger.debug('No hooks found in workspace')
except Exception as e:
_logger.warning(f'Failed to load hooks: {e}', exc_info=True)
- # Continue without hooks - don't fail conversation startup
- # Incorporate plugin parameters into initial message if specified
+ # --- plugins --------------------------------------------------------
final_initial_message = self._construct_initial_message_with_plugin_params(
initial_message, plugins
)
-
- # Convert PluginSpec list to SDK PluginSource list for agent server
sdk_plugins: list[PluginSource] | None = None
if plugins:
sdk_plugins = [
@@ -1449,85 +1332,21 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
for p in plugins
]
- # Create and return the final request
- return StartConversationRequest(
- conversation_id=conversation_id,
- agent=agent,
- workspace=workspace,
- confirmation_policy=self._select_confirmation_policy(
- bool(user.confirmation_mode), user.security_analyzer
- ),
- initial_message=final_initial_message,
- secrets=secrets,
- plugins=sdk_plugins,
- hook_config=hook_config,
- )
-
- async def _build_start_conversation_request_for_user(
- self,
- sandbox: SandboxInfo,
- conversation_id: UUID,
- initial_message: SendMessageRequest | None,
- system_message_suffix: str | None,
- git_provider: ProviderType | None,
- working_dir: str,
- agent_type: AgentType = AgentType.DEFAULT,
- llm_model: str | None = None,
- remote_workspace: AsyncRemoteWorkspace | None = None,
- selected_repository: str | None = None,
- plugins: list[PluginSpec] | None = None,
- ) -> StartConversationRequest:
- """Build a complete conversation request for a user.
-
- This method orchestrates the creation of a conversation request by:
- 1. Setting up git provider secrets
- 2. Configuring LLM and MCP settings
- 3. Creating an agent with appropriate context
- 4. Finalizing the request with skills and metadata
- 5. Passing plugins to the agent server for remote plugin loading
- """
- user = await self.user_context.get_user_info()
-
- # Compute the project root — this is the repo directory when a repo is
- # selected, or the sandbox working_dir otherwise. All tools, hooks,
- # setup scripts, and plan paths must use this consistently.
- project_dir = get_project_dir(working_dir, selected_repository)
- workspace = LocalWorkspace(working_dir=project_dir)
-
- # Set up secrets for all git providers
- secrets = await self._setup_secrets_for_git_providers(user)
-
- # Configure LLM and MCP
- llm, mcp_config = await self._configure_llm_and_mcp(
- user, llm_model, conversation_id
- )
-
- # Create agent with context
- agent = self._create_agent_with_context(
- llm,
- agent_type,
- system_message_suffix,
- mcp_config,
- user.condenser_max_size,
- secrets=secrets,
- git_provider=git_provider,
- working_dir=project_dir,
+ # --- populate ConversationSettings and build request ----------------
+ conv_settings = user.conversation_settings.model_copy(
+ update={
+ 'agent_settings': configured_agent_settings,
+ 'workspace': workspace,
+ 'conversation_id': conversation_id,
+ 'initial_message': final_initial_message,
+ 'plugins': sdk_plugins,
+ 'hook_config': hook_config,
+ }
)
- # Finalize and return the conversation request
- return await self._finalize_conversation_request(
- agent,
- conversation_id,
- user,
- workspace,
- initial_message,
- secrets,
- sandbox,
- remote_workspace,
- selected_repository,
- project_dir,
- plugins=plugins,
- )
+ # Pass agent explicitly — it has server-only overrides (system
+ # prompts, LLM metadata, skills) applied after create_agent().
+ return conv_settings.create_request(StartConversationRequest, agent=agent)
async def _process_pending_messages(
self,
diff --git a/openhands/app_server/sandbox/sandbox_spec_service.py b/openhands/app_server/sandbox/sandbox_spec_service.py
index 1fa17c9874..1d6cca1785 100644
--- a/openhands/app_server/sandbox/sandbox_spec_service.py
+++ b/openhands/app_server/sandbox/sandbox_spec_service.py
@@ -13,7 +13,7 @@ from openhands.sdk.utils.models import DiscriminatedUnionMixin
# The version of the agent server to use for deployments.
# Typically this will be the same as the values from the pyproject.toml
-AGENT_SERVER_IMAGE = 'ghcr.io/openhands/agent-server:1.16.1-python'
+AGENT_SERVER_IMAGE = 'ghcr.io/openhands/agent-server:1.17.0-python'
class SandboxSpecService(ABC):
diff --git a/openhands/app_server/settings/settings_router.py b/openhands/app_server/settings/settings_router.py
index 81dc2d7329..a50e57679a 100644
--- a/openhands/app_server/settings/settings_router.py
+++ b/openhands/app_server/settings/settings_router.py
@@ -4,6 +4,7 @@ This module provides the V1 API routes for user settings under /api/v1/settings.
"""
import os
+from typing import Any
from fastapi import APIRouter, Depends, status
from fastapi.responses import JSONResponse
@@ -14,6 +15,7 @@ from openhands.integrations.provider import (
PROVIDER_TOKEN_TYPE,
ProviderType,
)
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.server.routes.secrets import invalidate_legacy_secrets_store
from openhands.server.settings import (
GETSettingsModel,
@@ -42,66 +44,28 @@ router = APIRouter(
)
-async def store_llm_settings(
- settings: Settings, existing_settings: Settings
-) -> Settings:
- """Merge LLM settings with existing settings."""
- if not existing_settings:
- return settings
-
- # Preserve unset LLM settings
- settings.llm_api_key = settings.llm_api_key or existing_settings.llm_api_key
- settings.llm_model = settings.llm_model or existing_settings.llm_model
-
- if settings.llm_base_url is None:
- # Not provided at all (e.g. MCP config save) - preserve existing or auto-detect
- if existing_settings.llm_base_url:
- settings.llm_base_url = existing_settings.llm_base_url
- elif is_openhands_model(settings.llm_model):
- # OpenHands models use the LiteLLM proxy
- settings.llm_base_url = LITE_LLM_API_URL
- elif settings.llm_model:
- # For non-openhands models, try to get URL from litellm
+def _post_merge_llm_fixups(settings: Settings) -> None:
+ """Apply LLM-specific fixups after merging settings.
+
+ When the merged LLM base_url is empty-string, treat it as cleared.
+ When it is None, try to auto-detect the provider default.
+ """
+ llm = settings.agent_settings.llm
+
+ if llm.base_url == '':
+ llm.base_url = None
+ elif llm.base_url is None and llm.model:
+ if is_openhands_model(llm.model):
+ llm.base_url = LITE_LLM_API_URL
+ else:
try:
- api_base = get_provider_api_base(settings.llm_model)
+ api_base = get_provider_api_base(llm.model)
if api_base:
- settings.llm_base_url = api_base
- else:
- logger.debug(
- f'No api_base found in litellm for model: {settings.llm_model}'
- )
+ llm.base_url = api_base
except Exception as e:
logger.error(
- f'Failed to get api_base from litellm for model {settings.llm_model}: {e}'
+ f'Failed to get api_base from litellm for model {llm.model}: {e}'
)
- elif settings.llm_base_url == '':
- # Explicitly cleared by the user (basic view save or advanced view clear)
- settings.llm_base_url = None
-
- settings.search_api_key = (
- settings.search_api_key or existing_settings.search_api_key
- )
- return settings
-
-
-def convert_to_settings(settings_with_token_data: Settings) -> Settings:
- """Convert settings with token data to Settings model."""
- settings_data = settings_with_token_data.model_dump()
-
- # Filter out additional fields from `SettingsWithTokenData`
- filtered_settings_data = {
- key: value
- for key, value in settings_data.items()
- if key in Settings.model_fields # Ensures only `Settings` fields are included
- }
-
- # Convert the API keys to `SecretStr` instances
- filtered_settings_data['llm_api_key'] = settings_with_token_data.llm_api_key
- filtered_settings_data['search_api_key'] = settings_with_token_data.search_api_key
-
- # Create a new Settings instance
- settings = Settings(**filtered_settings_data)
- return settings
# NOTE: We use response_model=None for endpoints that return JSONResponse directly.
@@ -157,26 +121,34 @@ async def load_settings(
if provider_token.token or provider_token.user_id:
provider_tokens_set[provider_type] = provider_token.host
+ llm = settings.agent_settings.llm
settings_with_token_data = GETSettingsModel(
**settings.model_dump(exclude={'secrets_store'}),
- llm_api_key_set=settings.llm_api_key is not None
- and bool(settings.llm_api_key),
+ llm_api_key_set=settings.llm_api_key_is_set,
search_api_key_set=settings.search_api_key is not None
and bool(settings.search_api_key),
provider_tokens_set=provider_tokens_set,
)
+ # Convert litellm_proxy/ back to openhands/ for the frontend
+ resp_llm = settings_with_token_data.agent_settings.llm
+ if resp_llm.model and resp_llm.model.startswith('litellm_proxy/'):
+ resp_llm.model = (
+ f'openhands/{resp_llm.model.removeprefix("litellm_proxy/")}'
+ )
+
# If the base url matches the default for the provider, we don't send it
- # So that the frontend can display basic mode
- if is_openhands_model(settings.llm_model):
- if settings.llm_base_url == LITE_LLM_API_URL:
- settings_with_token_data.llm_base_url = None
- elif settings.llm_model and settings.llm_base_url == get_provider_api_base(
- settings.llm_model
- ):
- settings_with_token_data.llm_base_url = None
-
- settings_with_token_data.llm_api_key = None
+ # So that the frontend can display basic mode.
+ # Normalize trailing slashes for comparison since the SDK may add one.
+ normalized_base = (llm.base_url or '').rstrip('/')
+ normalized_proxy = LITE_LLM_API_URL.rstrip('/')
+ if is_openhands_model(llm.model):
+ if normalized_base == normalized_proxy:
+ resp_llm.base_url = None
+ elif llm.model and llm.base_url == get_provider_api_base(llm.model):
+ resp_llm.base_url = None
+
+ resp_llm.api_key = None
settings_with_token_data.search_api_key = None
settings_with_token_data.sandbox_api_key = None
return settings_with_token_data
@@ -202,33 +174,33 @@ async def load_settings(
},
)
async def store_settings(
- settings: Settings,
+ payload: dict[str, Any],
settings_store: SettingsStore = Depends(get_user_settings_store),
) -> JSONResponse:
"""Store user settings.
- Saves the user settings including LLM configuration, provider tokens,
- and other user preferences.
+ Accepts a partial payload and deep-merges ``agent_settings`` and
+ ``conversation_settings`` with the existing persisted values so that
+ saving one settings page never overwrites fields owned by another.
Returns:
200: Settings stored successfully
500: Error storing settings
"""
- # Check provider tokens are valid
try:
existing_settings = await settings_store.load()
+ settings = existing_settings.model_copy() if existing_settings else Settings()
+ settings.update(payload)
- # Convert to Settings model and merge with existing settings
- if existing_settings:
- settings = await store_llm_settings(settings, existing_settings)
+ _post_merge_llm_fixups(settings)
- # Keep existing analytics consent if not provided
+ if existing_settings:
+ if 'search_api_key' not in payload and settings.search_api_key is None:
+ settings.search_api_key = existing_settings.search_api_key
if settings.user_consents_to_analytics is None:
settings.user_consents_to_analytics = (
existing_settings.user_consents_to_analytics
)
-
- # Keep existing disabled_skills if not provided
if settings.disabled_skills is None:
settings.disabled_skills = existing_settings.disabled_skills
@@ -247,14 +219,11 @@ async def store_settings(
config.git_user_email = settings.git_user_email
git_config_updated = True
- # Note: Git configuration will be applied when new sessions are initialized
- # Existing sessions will continue with their current git configuration
if git_config_updated:
logger.info(
f'Updated global git configuration: name={config.git_user_name}, email={config.git_user_email}'
)
- settings = convert_to_settings(settings)
await settings_store.store(settings)
return JSONResponse(
status_code=status.HTTP_200_OK,
@@ -266,3 +235,15 @@ async def store_settings(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
content={'error': 'Something went wrong storing settings'},
)
+
+
[email protected]('/agent-schema')
+async def load_settings_schema() -> dict[str, Any]:
+ """Load the schema for settings"""
+ return AgentSettings.export_schema().model_dump(mode='json')
+
+
[email protected]('/conversation-schema')
+async def load_conversation_settings_schema() -> dict[str, Any]:
+ """Load the schema for conversations"""
+ return ConversationSettings.export_schema().model_dump(mode='json')
diff --git a/openhands/core/config/mcp_config.py b/openhands/core/config/mcp_config.py
index da271b24d5..9c381dd35d 100644
--- a/openhands/core/config/mcp_config.py
+++ b/openhands/core/config/mcp_config.py
@@ -1,26 +1,17 @@
-# IMPORTANT: LEGACY V0 CODE - Deprecated since version 1.0.0, scheduled for removal April 1, 2026
-# This file is part of the legacy (V0) implementation of OpenHands and will be removed soon as we complete the migration to V1.
-# OpenHands V1 uses the Software Agent SDK for the agentic core and runs a new application server. Please refer to:
-# - V1 agentic core (SDK): https://github.com/OpenHands/software-agent-sdk
-# - V1 application server (in this repo): openhands/app_server/
-# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
-# Tag: Legacy-V0
+"""MCP configuration — thin wrappers around the SDK MCPConfig from *fastmcp*.
+
+All server configuration uses the unified ``MCPConfig.mcpServers`` dict.
+Legacy helpers (``from_toml_section``, ``merge``) are provided for
+config.toml parsing and server merging.
+"""
+
from __future__ import annotations
import os
-import re
import shlex
-from typing import TYPE_CHECKING
-from urllib.parse import urlparse
-
-from pydantic import (
- BaseModel,
- ConfigDict,
- Field,
- ValidationError,
- field_validator,
- model_validator,
-)
+from typing import TYPE_CHECKING, Any
+
+from fastmcp.mcp_config import MCPConfig, RemoteMCPServer, StdioMCPServer
if TYPE_CHECKING:
from openhands.core.config.openhands_config import OpenHandsConfig
@@ -28,358 +19,150 @@ if TYPE_CHECKING:
from openhands.core.logger import openhands_logger as logger
from openhands.utils.import_utils import get_impl
+__all__ = [
+ 'MCPConfig',
+ 'RemoteMCPServer',
+ 'StdioMCPServer',
+ 'OpenHandsMCPConfig',
+ 'OpenHandsMCPConfigImpl',
+ 'merge_mcp_configs',
+ 'mcp_config_from_toml',
+]
-def _validate_mcp_url(url: str) -> str:
- """Shared URL validation logic for MCP servers."""
- if not url.strip():
- raise ValueError('URL cannot be empty')
-
- url = url.strip()
- try:
- parsed = urlparse(url)
- if not parsed.scheme:
- raise ValueError('URL must include a scheme (http:// or https://)')
- if not parsed.netloc:
- raise ValueError('URL must include a valid domain/host')
- if parsed.scheme not in ['http', 'https', 'ws', 'wss']:
- raise ValueError('URL scheme must be http, https, ws, or wss')
- return url
- except Exception as e:
- if isinstance(e, ValueError):
- raise
- raise ValueError(f'Invalid URL format: {str(e)}')
-
-
-class MCPSSEServerConfig(BaseModel):
- """Configuration for a single MCP server.
-
- Attributes:
- url: The server URL
- api_key: Optional API key for authentication
- """
-
- url: str
- api_key: str | None = None
-
- @field_validator('url')
- @classmethod
- def validate_url(cls, v: str) -> str:
- """Validate URL format for MCP servers."""
- return _validate_mcp_url(v)
-
-
-class MCPStdioServerConfig(BaseModel):
- """Configuration for a MCP server that uses stdio.
-
- Attributes:
- name: The name of the server
- command: The command to run the server
- args: The arguments to pass to the server
- env: The environment variables to set for the server
- """
-
- name: str
- command: str
- args: list[str] = Field(default_factory=list)
- env: dict[str, str] = Field(default_factory=dict)
- @field_validator('name', mode='before')
- @classmethod
- def validate_server_name(cls, v: str) -> str:
- """Validate server name for stdio MCP servers."""
- if not v.strip():
- raise ValueError('Server name cannot be empty')
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
- v = v.strip()
- # Check for valid characters (alphanumeric, hyphens, underscores)
- if not re.match(r'^[a-zA-Z0-9_-]+$', v):
- raise ValueError(
- 'Server name can only contain letters, numbers, hyphens, and underscores'
- )
+def merge_mcp_configs(base: MCPConfig, other: MCPConfig) -> MCPConfig:
+ """Return a new MCPConfig with servers from both configs merged."""
+ merged = dict(base.mcpServers)
+ merged.update(other.mcpServers)
+ return MCPConfig(mcpServers=merged)
- return v
- @field_validator('command', mode='before')
- @classmethod
- def validate_command(cls, v: str) -> str:
- """Validate command for stdio MCP servers."""
+def _parse_stdio_args(v: Any) -> list[str]:
+ """Parse stdio args from a string using shlex or return list as-is."""
+ if isinstance(v, str):
if not v.strip():
- raise ValueError('Command cannot be empty')
-
- v = v.strip()
-
- # Check that command doesn't contain spaces (should be a single executable)
- if ' ' in v:
- raise ValueError(
- 'Command should be a single executable without spaces (use arguments field for parameters)'
- )
-
- return v
-
- @field_validator('args', mode='before')
- @classmethod
- def parse_args(cls, v) -> list[str]:
- """Parse arguments from string or return list as-is.
-
- Supports shell-like argument parsing using shlex.split().
-
- Examples:
- - "-y mcp-remote https://example.com"
- - '--config "path with spaces" --debug'
- - "arg1 arg2 arg3"
- """
- if isinstance(v, str):
- if not v.strip():
- return []
-
- v = v.strip()
-
- # Use shell-like parsing for natural argument handling
- try:
- return shlex.split(v)
- except ValueError as e:
- # If shlex parsing fails (e.g., unmatched quotes), provide clear error
+ return []
+ return shlex.split(v.strip())
+ return list(v or [])
+
+
+def _parse_stdio_env(v: Any) -> dict[str, str]:
+ """Parse stdio env from a comma-separated string or return dict as-is."""
+ if isinstance(v, str):
+ env: dict[str, str] = {}
+ for pair in v.split(','):
+ pair = pair.strip()
+ if not pair:
+ continue
+ if '=' not in pair:
raise ValueError(
- f'Invalid argument format: {str(e)}. Use shell-like format, e.g., "arg1 arg2" or \'--config "value with spaces"\''
+ f"Environment variable '{pair}' must be in KEY=VALUE format"
)
-
- return v or []
-
- @field_validator('env', mode='before')
- @classmethod
- def parse_env(cls, v) -> dict[str, str]:
- """Parse environment variables from string or return dict as-is."""
- if isinstance(v, str):
- if not v.strip():
- return {}
-
- env = {}
- for pair in v.split(','):
- pair = pair.strip()
- if not pair:
- continue
-
- if '=' not in pair:
- raise ValueError(
- f"Environment variable '{pair}' must be in KEY=VALUE format"
- )
-
- key, value = pair.split('=', 1)
- key = key.strip()
- if not key:
- raise ValueError('Environment variable key cannot be empty')
- if not re.match(r'^[a-zA-Z_][a-zA-Z0-9_]*$', key):
- raise ValueError(
- f"Invalid environment variable name '{key}'. Must start with letter or underscore, contain only alphanumeric characters and underscores"
- )
-
- env[key] = value
- return env
- return v or {}
-
- def __eq__(self, other):
- """Override equality operator to compare server configurations.
-
- Two server configurations are considered equal if they have the same
- name, command, args, and env values. The order of args is important,
- but the order of env variables is not.
- """
- if not isinstance(other, MCPStdioServerConfig):
- return False
- return (
- self.name == other.name
- and self.command == other.command
- and self.args == other.args
- and set(self.env.items()) == set(other.env.items())
- )
+ key, value = pair.split('=', 1)
+ env[key.strip()] = value
+ return env
+ return dict(v or {})
-class MCPSHTTPServerConfig(BaseModel):
- """Configuration for a MCP server that uses SHTTP.
+def mcp_config_from_toml(data: dict[str, Any]) -> dict[str, MCPConfig]:
+ """Parse a ``[mcp]`` TOML section into ``{'mcp': MCPConfig}``.
- Attributes:
- url: The server URL
- api_key: Optional API key for authentication
- timeout: Timeout in seconds for tool calls (default: 60s)
+ Accepts the legacy ``sse_servers`` / ``shttp_servers`` / ``stdio_servers``
+ list format and converts to the unified ``mcpServers`` dict.
"""
+ servers: dict[str, RemoteMCPServer | StdioMCPServer] = {}
+
+ for entry in data.get('sse_servers', []):
+ if isinstance(entry, str):
+ entry = {'url': entry}
+ name = f'sse_{len([k for k in servers if k.startswith("sse_")])}'
+ servers[name] = RemoteMCPServer(
+ url=entry['url'],
+ transport='sse',
+ auth=entry.get('api_key'),
+ )
- url: str
- api_key: str | None = None
- timeout: int | None = 60
-
- @field_validator('url', mode='before')
- @classmethod
- def validate_url(cls, v: str) -> str:
- """Validate URL format for MCP servers."""
- return _validate_mcp_url(v)
-
- @field_validator('timeout')
- @classmethod
- def validate_timeout(cls, v: int | None) -> int | None:
- """Validate timeout value for MCP tool calls."""
- if v is not None:
- if v <= 0:
- raise ValueError('Timeout must be positive')
- if v > 3600: # 1 hour max
- raise ValueError('Timeout cannot exceed 3600 seconds')
- return v
-
-
-class MCPConfig(BaseModel):
- """Configuration for MCP (Message Control Protocol) settings.
-
- Attributes:
- sse_servers: List of MCP SSE server configs
- stdio_servers: List of MCP stdio server configs. These servers will be added to the MCP Router running inside runtime container.
- shttp_servers: List of MCP HTTP server configs.
- """
+ for entry in data.get('shttp_servers', []):
+ if isinstance(entry, str):
+ entry = {'url': entry}
+ name = f'shttp_{len([k for k in servers if k.startswith("shttp_")])}'
+ servers[name] = RemoteMCPServer(
+ url=entry['url'],
+ transport='http',
+ auth=entry.get('api_key'),
+ timeout=entry.get('timeout', 60),
+ )
- sse_servers: list[MCPSSEServerConfig] = Field(default_factory=list)
- stdio_servers: list[MCPStdioServerConfig] = Field(default_factory=list)
- shttp_servers: list[MCPSHTTPServerConfig] = Field(default_factory=list)
- model_config = ConfigDict(extra='forbid')
+ for entry in data.get('stdio_servers', []):
+ name = entry.get(
+ 'name', f'stdio_{len([k for k in servers if k.startswith("stdio_")])}'
+ )
+ servers[name] = StdioMCPServer(
+ command=entry['command'],
+ args=_parse_stdio_args(entry.get('args', [])),
+ env=_parse_stdio_env(entry.get('env', {})),
+ )
- @staticmethod
- def _normalize_servers(servers_data: list[dict | str]) -> list[dict]:
- """Helper method to normalize SSE server configurations."""
- normalized = []
- for server in servers_data:
- if isinstance(server, str):
- normalized.append({'url': server})
- else:
- normalized.append(server)
- return normalized
-
- @model_validator(mode='before')
- def convert_string_urls(cls, data):
- """Convert string URLs to MCPSSEServerConfig objects."""
- if isinstance(data, dict):
- if 'sse_servers' in data:
- data['sse_servers'] = cls._normalize_servers(data['sse_servers'])
-
- if 'shttp_servers' in data:
- data['shttp_servers'] = cls._normalize_servers(data['shttp_servers'])
-
- return data
-
- def validate_servers(self) -> None:
- """Validate that server URLs are valid and unique."""
- urls = [server.url for server in self.sse_servers]
-
- # Check for duplicate server URLs
- if len(set(urls)) != len(urls):
- raise ValueError('Duplicate MCP server URLs are not allowed')
-
- # Validate URLs
- for url in urls:
- try:
- result = urlparse(url)
- if not all([result.scheme, result.netloc]):
- raise ValueError(f'Invalid URL format: {url}')
- except Exception as e:
- raise ValueError(f'Invalid URL {url}: {str(e)}')
-
- @classmethod
- def from_toml_section(cls, data: dict) -> dict[str, 'MCPConfig']:
- """Create a mapping of MCPConfig instances from a toml dictionary representing the [mcp] section.
-
- The configuration is built from all keys in data.
+ return {'mcp': MCPConfig(mcpServers=servers)}
- Returns:
- dict[str, MCPConfig]: A mapping where the key "mcp" corresponds to the [mcp] configuration
- """
- # Initialize the result mapping
- mcp_mapping: dict[str, MCPConfig] = {}
-
- try:
- # Convert all entries in sse_servers to MCPSSEServerConfig objects
- if 'sse_servers' in data:
- data['sse_servers'] = cls._normalize_servers(data['sse_servers'])
- servers: list[
- MCPSSEServerConfig | MCPStdioServerConfig | MCPSHTTPServerConfig
- ] = []
- for server in data['sse_servers']:
- servers.append(MCPSSEServerConfig(**server))
- data['sse_servers'] = servers
-
- # Convert all entries in stdio_servers to MCPStdioServerConfig objects
- if 'stdio_servers' in data:
- servers = []
- for server in data['stdio_servers']:
- servers.append(MCPStdioServerConfig(**server))
- data['stdio_servers'] = servers
-
- if 'shttp_servers' in data:
- data['shttp_servers'] = cls._normalize_servers(data['shttp_servers'])
- servers = []
- for server in data['shttp_servers']:
- servers.append(MCPSHTTPServerConfig(**server))
- data['shttp_servers'] = servers
-
- # Create SSE config if present
- mcp_config = MCPConfig.model_validate(data)
- mcp_config.validate_servers()
-
- # Create the main MCP config
- mcp_mapping['mcp'] = cls(
- sse_servers=mcp_config.sse_servers,
- stdio_servers=mcp_config.stdio_servers,
- shttp_servers=mcp_config.shttp_servers,
- )
- except ValidationError as e:
- raise ValueError(f'Invalid MCP configuration: {e}')
- return mcp_mapping
-
- def merge(self, other: MCPConfig):
- return MCPConfig(
- sse_servers=self.sse_servers + other.sse_servers,
- stdio_servers=self.stdio_servers + other.stdio_servers,
- shttp_servers=self.shttp_servers + other.shttp_servers,
- )
+
+# ---------------------------------------------------------------------------
+# OpenHands default MCP server factory
+# ---------------------------------------------------------------------------
class OpenHandsMCPConfig:
+ """Factory for the default OpenHands MCP server entries."""
+
@staticmethod
- def add_search_engine(app_config: 'OpenHandsConfig') -> MCPStdioServerConfig | None:
- """Add search engine to the MCP config."""
+ def add_search_engine(
+ app_config: 'OpenHandsConfig',
+ ) -> dict[str, StdioMCPServer] | None:
+ """Return a tavily stdio server entry if a Tavily API key is configured."""
if (
app_config.search_api_key
and app_config.search_api_key.get_secret_value().startswith('tvly-')
):
logger.info('Adding search engine to MCP config')
- return MCPStdioServerConfig(
- name='tavily',
- command='npx',
- args=['-y', '[email protected]'],
- env={'TAVILY_API_KEY': app_config.search_api_key.get_secret_value()},
- )
- else:
- logger.warning('No search engine API key found, skipping search engine')
- # Do not add search engine to MCP config in SaaS mode since it will be added by the OpenHands server
+ return {
+ 'tavily': StdioMCPServer(
+ command='npx',
+ args=['-y', '[email protected]'],
+ env={
+ 'TAVILY_API_KEY': app_config.search_api_key.get_secret_value()
+ },
+ )
+ }
+ logger.warning('No search engine API key found, skipping search engine')
return None
@staticmethod
async def create_default_mcp_server_config(
host: str, config: 'OpenHandsConfig', user_id: str | None = None
- ) -> tuple[MCPSHTTPServerConfig | None, list[MCPStdioServerConfig]]:
- """Create a default MCP server configuration.
+ ) -> dict[str, RemoteMCPServer | StdioMCPServer]:
+ """Return a dict of default MCP server entries to merge into config.mcp.
- Args:
- host: Host string
- config: OpenHandsConfig
- user_id: Optional user ID for the MCP server
Returns:
- tuple[MCPSHTTPServerConfig | None, list[MCPStdioServerConfig]]: A tuple containing the default SHTTP server configuration (or None) and a list of MCP stdio server configurations
+ dict mapping server names to their configs.
"""
- stdio_servers = []
- search_engine_stdio_server = OpenHandsMCPConfig.add_search_engine(config)
- if search_engine_stdio_server:
- stdio_servers.append(search_engine_stdio_server)
+ servers: dict[str, RemoteMCPServer | StdioMCPServer] = {}
- shttp_servers = MCPSHTTPServerConfig(url=f'http://{host}/mcp/mcp', api_key=None)
+ search = OpenHandsMCPConfig.add_search_engine(config)
+ if search:
+ servers.update(search)
+
+ servers['openhands'] = RemoteMCPServer(
+ url=f'http://{host}/mcp/mcp',
+ transport='http',
+ timeout=60,
+ )
- return shttp_servers, stdio_servers
+ return servers
openhands_mcp_config_cls = os.environ.get(
diff --git a/openhands/core/config/utils.py b/openhands/core/config/utils.py
index 8795dad344..38330aff99 100644
--- a/openhands/core/config/utils.py
+++ b/openhands/core/config/utils.py
@@ -30,7 +30,7 @@ from openhands.core.config.condenser_config import (
from openhands.core.config.extended_config import ExtendedConfig
from openhands.core.config.kubernetes_config import KubernetesConfig
from openhands.core.config.llm_config import LLMConfig
-from openhands.core.config.mcp_config import MCPConfig
+from openhands.core.config.mcp_config import mcp_config_from_toml
from openhands.core.config.model_routing_config import ModelRoutingConfig
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.core.config.sandbox_config import SandboxConfig
@@ -109,9 +109,7 @@ def load_from_env(
cast_value = literal_eval(value)
# If it's a list of Pydantic models
if get_origin(field_type) is list:
- inner_type = get_args(field_type)[
- 0
- ] # e.g., MCPSHTTPServerConfig
+ inner_type = get_args(field_type)[0]
if isinstance(inner_type, type) and issubclass(
inner_type, BaseModel
):
@@ -282,8 +280,7 @@ def load_from_toml(cfg: OpenHandsConfig, toml_file: str = 'config.toml') -> None
# Process MCP sections if present
if 'mcp' in toml_config:
try:
- mcp_mapping = MCPConfig.from_toml_section(toml_config['mcp'])
- # We only use the base mcp config for now
+ mcp_mapping = mcp_config_from_toml(toml_config['mcp'])
if 'mcp' in mcp_mapping:
cfg.mcp = mcp_mapping['mcp']
except (TypeError, KeyError, ValidationError) as e:
@@ -291,7 +288,6 @@ def load_from_toml(cfg: OpenHandsConfig, toml_file: str = 'config.toml') -> None
f'Cannot parse MCP config from toml, values have not been applied.\nError: {e}'
)
except ValueError:
- # Re-raise ValueError from MCPConfig.from_toml_section
raise ValueError('Error in MCP sections in config.toml')
# Process kubernetes section if present
diff --git a/openhands/core/main.py b/openhands/core/main.py
index f0042bc2a9..379f660a76 100644
--- a/openhands/core/main.py
+++ b/openhands/core/main.py
@@ -21,7 +21,7 @@ from openhands.core.config import (
parse_arguments,
setup_config_from_args,
)
-from openhands.core.config.mcp_config import OpenHandsMCPConfigImpl
+from openhands.core.config.mcp_config import MCPConfig, OpenHandsMCPConfigImpl
from openhands.core.logger import openhands_logger as logger
from openhands.core.loop import run_agent_until_done
from openhands.core.schema import AgentState
@@ -153,13 +153,12 @@ async def run_controller(
# Add MCP tools to the agent
if agent.config.enable_mcp:
# Add OpenHands' MCP server by default
- (
- _,
- openhands_mcp_stdio_servers,
- ) = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
+ default_servers = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
config.mcp_host, config, None
)
- runtime.config.mcp.stdio_servers.extend(openhands_mcp_stdio_servers)
+ runtime.config.mcp = MCPConfig(
+ mcpServers={**runtime.config.mcp.mcpServers, **default_servers}
+ )
await add_mcp_tools_to_agent(agent, runtime, memory)
diff --git a/openhands/mcp/client.py b/openhands/mcp/client.py
index b35f4be461..22bfba0525 100644
--- a/openhands/mcp/client.py
+++ b/openhands/mcp/client.py
@@ -11,11 +11,7 @@ from mcp import McpError
from mcp.types import CallToolResult
from pydantic import BaseModel, ConfigDict, Field
-from openhands.core.config.mcp_config import (
- MCPSHTTPServerConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
-)
+from openhands.core.config.mcp_config import RemoteMCPServer, StdioMCPServer
from openhands.core.logger import openhands_logger as logger
from openhands.mcp.error_collector import mcp_error_collector
from openhands.mcp.tool import MCPClientTool
@@ -57,44 +53,49 @@ class MCPClient(BaseModel):
async def connect_http(
self,
- server: MCPSSEServerConfig | MCPSHTTPServerConfig,
+ server: RemoteMCPServer,
conversation_id: str | None = None,
timeout: float = 30.0,
):
- """Connect to MCP server using SHTTP or SSE transport."""
+ """Connect to MCP server using streamable HTTP or SSE transport."""
server_url = server.url
- api_key = server.api_key
+ api_key = (
+ str(server.auth) if server.auth else None
+ ) # SDK uses `auth` for bearer token
if not server_url:
raise ValueError('Server URL is required.')
+ transport_type = server.transport or 'http'
+
try:
- headers = (
- {
- 'Authorization': f'Bearer {api_key}',
- 's': api_key, # We need this for action execution server's MCP Router
- 'X-Session-API-Key': api_key, # We need this for Remote Runtime
- }
- if api_key
- else {}
+ headers: dict[str, str] = (
+ {k: str(v) for k, v in server.headers.items()} if server.headers else {}
)
+ if api_key:
+ headers.update(
+ {
+ 'Authorization': f'Bearer {api_key}',
+ 's': api_key,
+ 'X-Session-API-Key': api_key,
+ }
+ )
if conversation_id:
headers['X-OpenHands-ServerConversation-ID'] = conversation_id
- # Instantiate custom transports due to custom headers
- if isinstance(server, MCPSHTTPServerConfig):
- streamable_transport = StreamableHttpTransport(
+ transport: SSETransport | StreamableHttpTransport
+ if transport_type == 'sse':
+ transport = SSETransport(
url=server_url,
- headers=headers if headers else None,
+ headers=headers or None,
)
- self.client = Client(streamable_transport, timeout=timeout)
else:
- sse_transport = SSETransport(
+ transport = StreamableHttpTransport(
url=server_url,
- headers=headers if headers else None,
+ headers=headers or None,
)
- self.client = Client(sse_transport, timeout=timeout)
+ self.client = Client(transport, timeout=timeout)
await self._initialize_and_list_tools()
except McpError as e:
@@ -102,29 +103,31 @@ class MCPClient(BaseModel):
logger.error(error_msg)
mcp_error_collector.add_error(
server_name=server_url,
- server_type='shttp'
- if isinstance(server, MCPSHTTPServerConfig)
- else 'sse',
+ server_type=transport_type,
error_message=error_msg,
exception_details=str(e),
)
- raise # Re-raise the error
+ raise
except Exception as e:
error_msg = f'Error connecting to {server_url}: {e}'
logger.error(error_msg)
mcp_error_collector.add_error(
server_name=server_url,
- server_type='shttp'
- if isinstance(server, MCPSHTTPServerConfig)
- else 'sse',
+ server_type=transport_type,
error_message=error_msg,
exception_details=str(e),
)
raise
- async def connect_stdio(self, server: MCPStdioServerConfig, timeout: float = 30.0):
+ async def connect_stdio(
+ self,
+ server: StdioMCPServer,
+ name: str | None = None,
+ timeout: float = 30.0,
+ ):
"""Connect to MCP server using stdio transport."""
+ server_name = name or f'{server.command} {" ".join(server.args or [])}'
try:
transport = StdioTransport(
command=server.command, args=server.args or [], env=server.env
@@ -132,9 +135,6 @@ class MCPClient(BaseModel):
self.client = Client(transport, timeout=timeout)
await self._initialize_and_list_tools()
except Exception as e:
- server_name = getattr(
- server, 'name', f'{server.command} {" ".join(server.args or [])}'
- )
error_msg = f'Failed to connect to stdio server {server_name}: {e}'
logger.error(error_msg)
mcp_error_collector.add_error(
diff --git a/openhands/mcp/utils.py b/openhands/mcp/utils.py
index 82fb267c8d..c6326ba1d7 100644
--- a/openhands/mcp/utils.py
+++ b/openhands/mcp/utils.py
@@ -12,9 +12,8 @@ from mcp import McpError
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSHTTPServerConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
from openhands.core.logger import openhands_logger as logger
from openhands.events.action.mcp import MCPAction
@@ -23,7 +22,6 @@ from openhands.events.observation.observation import Observation
from openhands.mcp.client import MCPClient
from openhands.mcp.error_collector import mcp_error_collector
from openhands.runtime.base import Runtime
-from openhands.runtime.impl.cli.cli_runtime import CLIRuntime
from openhands.utils._redact_compat import (
redact_text_secrets,
redact_url_params,
@@ -67,40 +65,33 @@ def convert_mcp_clients_to_tools(mcp_clients: list[MCPClient] | None) -> list[di
async def create_mcp_clients(
- sse_servers: list[MCPSSEServerConfig],
- shttp_servers: list[MCPSHTTPServerConfig],
+ mcp_config: MCPConfig,
conversation_id: str | None = None,
- stdio_servers: list[MCPStdioServerConfig] | None = None,
) -> list[MCPClient]:
+ """Create MCP clients from an MCPConfig.
+
+ Args:
+ mcp_config: Unified MCP configuration.
+ conversation_id: Optional conversation ID for remote servers.
+ """
import sys
- # Skip MCP clients on Windows
if sys.platform == 'win32':
logger.info(
'MCP functionality is disabled on Windows, skipping client creation'
)
return []
- if stdio_servers is None:
- stdio_servers = []
-
- servers: list[MCPSSEServerConfig | MCPSHTTPServerConfig | MCPStdioServerConfig] = [
- *sse_servers,
- *shttp_servers,
- *stdio_servers,
- ]
-
- if not servers:
+ if not mcp_config.mcpServers:
return []
- mcp_clients = []
+ mcp_clients: list[MCPClient] = []
- for server in servers:
- if isinstance(server, MCPStdioServerConfig):
- # Validate that the command exists before connecting
+ for name, server in mcp_config.mcpServers.items():
+ if isinstance(server, StdioMCPServer):
if not shutil.which(server.command):
logger.error(
- f'Skipping MCP stdio server "{server.name}": command "{server.command}" not found. '
+ f'Skipping MCP stdio server "{name}": command "{server.command}" not found. '
f'Please install {server.command} or remove this server from your configuration.'
)
continue
@@ -110,72 +101,56 @@ async def create_mcp_clients(
)
client = MCPClient()
try:
- await client.connect_stdio(server)
-
- # Log which tools this specific server provides
+ await client.connect_stdio(server, name=name)
tool_names = [tool.name for tool in client.tools]
- server_name = getattr(
- server, 'name', f'{server.command} {" ".join(server.args or [])}'
- )
logger.debug(
- f'Successfully connected to MCP stdio server {server_name} - '
+ f'Successfully connected to MCP stdio server {name} - '
f'provides {len(tool_names)} tools: {tool_names}'
)
-
mcp_clients.append(client)
except Exception as e:
- # Error is already logged and collected in client.connect_stdio()
logger.error(
f'Failed to connect to {redact_text_secrets(str(server))}: {str(e)}',
exc_info=True,
)
continue
- is_shttp = isinstance(server, MCPSHTTPServerConfig)
-
- connection_type = 'SHTTP' if is_shttp else 'SSE'
- logger.info(
- f'Initializing MCP agent for {redact_text_secrets(str(server))} with {connection_type} connection...'
- )
- client = MCPClient()
-
- # Set server timeout for SHTTP servers
- if isinstance(server, MCPSHTTPServerConfig) and server.timeout is not None:
- client.server_timeout = float(server.timeout)
- logger.debug(f'Set SHTTP server timeout to {server.timeout}s')
-
- try:
- await client.connect_http(server, conversation_id=conversation_id)
-
- # Log which tools this specific server provides
- tool_names = [tool.name for tool in client.tools]
- logger.debug(
- f'Successfully connected to MCP STTP server {redact_url_params(server.url)} - '
- f'provides {len(tool_names)} tools: {tool_names}'
+ if isinstance(server, RemoteMCPServer):
+ transport = server.transport or 'http'
+ logger.info(
+ f'Initializing MCP agent for {redact_text_secrets(str(server))} with {transport} connection...'
)
+ client = MCPClient()
- # Only add the client to the list after a successful connection
- mcp_clients.append(client)
+ if server.timeout is not None:
+ client.server_timeout = float(server.timeout)
+ logger.debug(f'Set server timeout to {server.timeout}s')
- except Exception as e:
- # Error is already logged and collected in client.connect_http()
- logger.error(
- f'Failed to connect to {redact_text_secrets(str(server))}: {str(e)}',
- exc_info=True,
- )
+ try:
+ await client.connect_http(server, conversation_id=conversation_id)
+ tool_names = [tool.name for tool in client.tools]
+ logger.debug(
+ f'Successfully connected to MCP server {redact_url_params(server.url)} - '
+ f'provides {len(tool_names)} tools: {tool_names}'
+ )
+ mcp_clients.append(client)
+ except Exception as e:
+ logger.error(
+ f'Failed to connect to {redact_text_secrets(str(server))}: {str(e)}',
+ exc_info=True,
+ )
return mcp_clients
async def fetch_mcp_tools_from_config(
- mcp_config: MCPConfig, conversation_id: str | None = None, use_stdio: bool = False
+ mcp_config: MCPConfig, conversation_id: str | None = None
) -> list[dict]:
"""Retrieves the list of MCP tools from the MCP clients.
Args:
mcp_config: The MCP configuration
conversation_id: Optional conversation ID to associate with the MCP clients
- use_stdio: Whether to use stdio servers for MCP clients, set to True when running from a CLI runtime
Returns:
A list of tool dictionaries. Returns an empty list if no connections could be established.
@@ -195,12 +170,7 @@ async def fetch_mcp_tools_from_config(
)
# Create clients - this will fetch tools but not maintain active connections
- mcp_clients = await create_mcp_clients(
- mcp_config.sse_servers,
- mcp_config.shttp_servers,
- conversation_id,
- mcp_config.stdio_servers if use_stdio else [],
- )
+ mcp_clients = await create_mcp_clients(mcp_config, conversation_id)
if not mcp_clients:
logger.debug('No MCP clients were successfully connected')
@@ -317,33 +287,26 @@ async def add_mcp_tools_to_agent(
'Runtime must be initialized before adding MCP tools'
)
- extra_stdio_servers = []
+ extra_stdio_servers: dict[str, StdioMCPServer] = {}
# Add microagent MCP tools if available
microagent_mcp_configs = memory.get_microagent_mcp_tools()
- for mcp_config in microagent_mcp_configs:
- if mcp_config.sse_servers:
- logger.warning(
- 'Microagent MCP config contains SSE servers, it is not yet supported.'
- )
-
- if mcp_config.stdio_servers:
- for stdio_server in mcp_config.stdio_servers:
- # Check if this stdio server is already in the config
- if stdio_server not in extra_stdio_servers:
- extra_stdio_servers.append(stdio_server)
- logger.warning(
- f'Added microagent stdio server: {stdio_server.name}'
- )
+ for mcp_cfg in microagent_mcp_configs:
+ for name, server in mcp_cfg.mcpServers.items():
+ if isinstance(server, StdioMCPServer):
+ if name not in extra_stdio_servers:
+ extra_stdio_servers[name] = server
+ logger.warning(f'Added microagent stdio server: {name}')
+ else:
+ logger.warning(
+ f'Microagent MCP config contains non-stdio server {name}, not yet supported.'
+ )
# Add the runtime as another MCP server
- updated_mcp_config = runtime.get_mcp_config(extra_stdio_servers)
+ updated_mcp_config = runtime.get_mcp_config(extra_stdio_servers or None)
# Fetch the MCP tools
- # Only use stdio if run from a CLI runtime
- mcp_tools = await fetch_mcp_tools_from_config(
- updated_mcp_config, use_stdio=isinstance(runtime, CLIRuntime)
- )
+ mcp_tools = await fetch_mcp_tools_from_config(updated_mcp_config)
tool_names = [tool['function']['name'] for tool in mcp_tools]
logger.info(f'Loaded {len(mcp_tools)} MCP tools: {tool_names}')
diff --git a/openhands/microagent/microagent.py b/openhands/microagent/microagent.py
index 46bf5af1cc..65dbc4b191 100644
--- a/openhands/microagent/microagent.py
+++ b/openhands/microagent/microagent.py
@@ -105,13 +105,22 @@ class BaseMicroagent(BaseModel):
metadata = MicroagentMetadata(**metadata_dict)
# Validate MCP tools configuration if present
- if metadata.mcp_tools:
- if metadata.mcp_tools.sse_servers:
+ if metadata.mcp_tools and metadata.mcp_tools.mcpServers:
+ from openhands.core.config.mcp_config import StdioMCPServer
+
+ has_stdio = any(
+ isinstance(s, StdioMCPServer)
+ for s in metadata.mcp_tools.mcpServers.values()
+ )
+ has_non_stdio = any(
+ not isinstance(s, StdioMCPServer)
+ for s in metadata.mcp_tools.mcpServers.values()
+ )
+ if has_non_stdio:
logger.warning(
- f'Microagent {metadata.name} has SSE servers. Only stdio servers are currently supported.'
+ f'Microagent {metadata.name} has remote servers. Only stdio servers are currently supported.'
)
-
- if not metadata.mcp_tools.stdio_servers:
+ if not has_stdio:
raise MicroagentValidationError(
f'Microagent {metadata.name} has MCP tools configuration but no stdio servers. '
'Only stdio servers are currently supported.'
diff --git a/openhands/runtime/action_execution_server.py b/openhands/runtime/action_execution_server.py
index d33ff8c8e8..f9dedfd975 100644
--- a/openhands/runtime/action_execution_server.py
+++ b/openhands/runtime/action_execution_server.py
@@ -43,7 +43,7 @@ from openhands.app_server.status.system_stats import (
get_system_stats,
update_last_execution_time,
)
-from openhands.core.config.mcp_config import MCPStdioServerConfig
+from openhands.core.config.mcp_config import StdioMCPServer
from openhands.core.exceptions import BrowserUnavailableException
from openhands.core.logger import get_uvicorn_log_config
from openhands.core.logger import openhands_logger as logger
@@ -873,7 +873,7 @@ if __name__ == '__main__':
logger.info(
f'Updating MCP server with tools: {redact_text_secrets(str(mcp_tools_to_sync))}'
)
- mcp_tools_to_sync = [MCPStdioServerConfig(**tool) for tool in mcp_tools_to_sync]
+ mcp_tools_to_sync = [StdioMCPServer(**tool) for tool in mcp_tools_to_sync]
try:
await mcp_proxy_manager.update_and_remount(app, mcp_tools_to_sync, ['*'])
logger.info('MCP Proxy Manager updated and remounted successfully')
diff --git a/openhands/runtime/base.py b/openhands/runtime/base.py
index 37951eff33..d7db7ce25a 100644
--- a/openhands/runtime/base.py
+++ b/openhands/runtime/base.py
@@ -25,7 +25,10 @@ from zipfile import ZipFile
import httpx
from openhands.core.config import OpenHandsConfig, SandboxConfig
-from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import (
+ MCPConfig,
+ StdioMCPServer,
+)
from openhands.core.exceptions import (
AgentRuntimeDisconnectedError,
)
@@ -255,7 +258,6 @@ class Runtime(FileEditRuntimeMixin):
self, runtime_status: RuntimeStatus, msg: str = '', level: str = 'info'
):
"""Sends a status message if the callback function was provided."""
-
self.runtime_status = runtime_status
if self.status_callback:
self.status_callback(level, runtime_status, msg)
@@ -276,7 +278,6 @@ class Runtime(FileEditRuntimeMixin):
max_retries: int = CMD_RETRY_MAX_ATTEMPTS,
) -> CmdOutputObservation:
"""Run command with exponential backoff retry on bash session timeout."""
-
if not cmd or not cmd.strip():
raise ValueError('Command cannot be empty')
if max_retries < 1:
@@ -1171,7 +1172,7 @@ fi
@abstractmethod
def get_mcp_config(
- self, extra_stdio_servers: list[MCPStdioServerConfig] | None = None
+ self, extra_stdio_servers: dict[str, StdioMCPServer] | None = None
) -> MCPConfig:
pass
@@ -1297,8 +1298,7 @@ fi
return self.git_handler.get_git_diff(file_path)
def get_workspace_branch(self, primary_repo_path: str | None = None) -> str | None:
- """
- Get the current branch of the workspace.
+ """Get the current branch of the workspace.
Args:
primary_repo_path: Path to the primary repository within the workspace.
diff --git a/openhands/runtime/impl/action_execution/action_execution_client.py b/openhands/runtime/impl/action_execution/action_execution_client.py
index 8cfa386971..fc113f9b0b 100644
--- a/openhands/runtime/impl/action_execution/action_execution_client.py
+++ b/openhands/runtime/impl/action_execution/action_execution_client.py
@@ -20,8 +20,8 @@ from openhands.app_server.status.system_stats import update_last_execution_time
from openhands.core.config import OpenHandsConfig
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
from openhands.core.exceptions import (
AgentRuntimeTimeoutError,
@@ -55,7 +55,6 @@ from openhands.llm.llm_registry import LLMRegistry
from openhands.runtime.base import Runtime
from openhands.runtime.plugins import PluginRequirement
from openhands.runtime.utils.request import send_request
-from openhands.utils._redact_compat import redact_text_secrets
from openhands.utils.http_session import HttpSession
from openhands.utils.tenacity_stop import stop_if_should_exit
@@ -91,7 +90,7 @@ class ActionExecutionClient(Runtime):
self.action_semaphore = threading.Semaphore(1) # Ensure one action at a time
self._runtime_closed: bool = False
self._vscode_token: str | None = None # initial dummy value
- self._last_updated_mcp_stdio_servers: list[MCPStdioServerConfig] = []
+ self._last_updated_mcp_stdio_servers: dict[str, StdioMCPServer] = {}
super().__init__(
config,
event_stream,
@@ -371,55 +370,49 @@ class ActionExecutionClient(Runtime):
return self.send_action_for_execution(action)
def get_mcp_config(
- self, extra_stdio_servers: list[MCPStdioServerConfig] | None = None
+ self, extra_stdio_servers: dict[str, StdioMCPServer] | None = None
) -> MCPConfig:
import sys
- # Check if we're on Windows - MCP is disabled on Windows
if sys.platform == 'win32':
- # Return empty MCP config on Windows
self.log('debug', 'MCP is disabled on Windows, returning empty config')
- return MCPConfig(sse_servers=[], stdio_servers=[])
+ return MCPConfig(mcpServers={})
- # Add the runtime as another MCP server
updated_mcp_config = self.config.mcp.model_copy()
- # Get current stdio servers
- current_stdio_servers: list[MCPStdioServerConfig] = list(
- updated_mcp_config.stdio_servers
- )
+ # Collect current stdio servers from config + extras
+ current_stdio: dict[str, StdioMCPServer] = {
+ name: server
+ for name, server in updated_mcp_config.mcpServers.items()
+ if isinstance(server, StdioMCPServer)
+ }
if extra_stdio_servers:
- current_stdio_servers.extend(extra_stdio_servers)
+ current_stdio.update(extra_stdio_servers)
- # Check if there are any new servers using the __eq__ operator
- new_servers = [
- server
- for server in current_stdio_servers
- if server not in self._last_updated_mcp_stdio_servers
- ]
+ # Find servers not yet sent to the action execution server
+ new_servers = {
+ name: server
+ for name, server in current_stdio.items()
+ if name not in self._last_updated_mcp_stdio_servers
+ }
self.log(
'debug',
- f'adding {len(new_servers)} new stdio servers to MCP config: {redact_text_secrets(str(new_servers))}',
+ f'adding {len(new_servers)} new stdio servers to MCP config: {list(new_servers.keys())}',
)
- # Only send update request if there are new servers
if new_servers:
- # Use a union of current servers and last updated servers for the update
- # This ensures we don't lose any servers that might be missing from either list
- combined_servers = current_stdio_servers.copy()
- for server in self._last_updated_mcp_stdio_servers:
- if server not in combined_servers:
- combined_servers.append(server)
+ # Merge current + previously-sent for the update payload
+ combined = {**self._last_updated_mcp_stdio_servers, **current_stdio}
stdio_tools = [
- server.model_dump(mode='json') for server in combined_servers
+ {'name': name, **server.model_dump(mode='json')}
+ for name, server in sorted(combined.items())
]
- stdio_tools.sort(key=lambda x: x.get('name', '')) # Sort by server name
self.log(
'debug',
- f'Updating MCP server with {len(new_servers)} new stdio servers (total: {len(combined_servers)})',
+ f'Updating MCP server with {len(new_servers)} new stdio servers (total: {len(combined)})',
)
response = self._send_action_server_request(
'POST',
@@ -436,27 +429,24 @@ class ActionExecutionClient(Runtime):
'warning',
f'Some MCP servers failed to be added: {result["router_error_log"]}',
)
-
- # Update our cached list with combined servers after successful update
- self._last_updated_mcp_stdio_servers = combined_servers.copy()
+ self._last_updated_mcp_stdio_servers = dict(combined)
self.log(
'debug',
- f'Successfully updated MCP stdio servers, now tracking {len(combined_servers)} servers',
+ f'Successfully updated MCP stdio servers, now tracking {len(combined)} servers',
)
self.log(
'info',
- f'Updated MCP config: {redact_text_secrets(str(updated_mcp_config.sse_servers))}',
+ f'Updated MCP config: {list(updated_mcp_config.mcpServers.keys())}',
)
else:
self.log('debug', 'No new stdio servers to update')
- if len(self._last_updated_mcp_stdio_servers) > 0:
- # We should always include the runtime as an MCP server whenever there's > 0 stdio servers
- updated_mcp_config.sse_servers.append(
- MCPSSEServerConfig(
- url=self.action_execution_server_url.rstrip('/') + '/mcp/sse',
- api_key=self.session_api_key,
- )
+ # Expose the runtime's MCP SSE proxy when stdio servers exist
+ if self._last_updated_mcp_stdio_servers:
+ updated_mcp_config.mcpServers['_runtime_proxy'] = RemoteMCPServer(
+ url=self.action_execution_server_url.rstrip('/') + '/mcp/sse',
+ transport='sse',
+ auth=self.session_api_key,
)
return updated_mcp_config
@@ -479,13 +469,11 @@ class ActionExecutionClient(Runtime):
updated_mcp_config = self.get_mcp_config()
self.log(
'debug',
- f'Creating MCP clients with servers: {redact_text_secrets(str(updated_mcp_config.sse_servers))}',
+ f'Creating MCP clients with servers: {list(updated_mcp_config.mcpServers.keys())}',
)
# Create clients for this specific operation
- mcp_clients = await create_mcp_clients(
- updated_mcp_config.sse_servers, updated_mcp_config.shttp_servers, self.sid
- )
+ mcp_clients = await create_mcp_clients(updated_mcp_config, self.sid)
# Call the tool and return the result
# No need for try/finally since disconnect() is now just resetting state
diff --git a/openhands/runtime/impl/cli/cli_runtime.py b/openhands/runtime/impl/cli/cli_runtime.py
index e657c9ffbb..a293b193dc 100644
--- a/openhands/runtime/impl/cli/cli_runtime.py
+++ b/openhands/runtime/impl/cli/cli_runtime.py
@@ -30,7 +30,7 @@ from openhands_aci.utils.diff import get_diff
from pydantic import SecretStr
from openhands.core.config import OpenHandsConfig
-from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import MCPConfig, StdioMCPServer
from openhands.core.logger import openhands_logger as logger
from openhands.events import EventStream
from openhands.events.action import (
@@ -713,28 +713,18 @@ class CLIRuntime(Runtime):
# Get the MCP config for this runtime
mcp_config = self.get_mcp_config()
- if (
- not mcp_config.sse_servers
- and not mcp_config.shttp_servers
- and not mcp_config.stdio_servers
- ):
+ if not mcp_config.mcpServers:
self.log('warning', 'No MCP servers configured')
return ErrorObservation('No MCP servers configured')
self.log(
'debug',
- f'Creating MCP clients for action {action.name} with servers: '
- f'SSE={len(mcp_config.sse_servers)}, SHTTP={len(mcp_config.shttp_servers)}, '
- f'stdio={len(mcp_config.stdio_servers)}',
+ f'Creating MCP clients for action {action.name} with '
+ f'{len(mcp_config.mcpServers)} servers',
)
# Create clients for this specific operation
- mcp_clients = await create_mcp_clients(
- mcp_config.sse_servers,
- mcp_config.shttp_servers,
- self.sid,
- mcp_config.stdio_servers,
- )
+ mcp_clients = await create_mcp_clients(mcp_config, self.sid)
if not mcp_clients:
self.log('warning', 'No MCP clients could be created')
@@ -931,39 +921,27 @@ class CLIRuntime(Runtime):
)
def get_mcp_config(
- self, extra_stdio_servers: list[MCPStdioServerConfig] | None = None
+ self, extra_stdio_servers: dict[str, StdioMCPServer] | None = None
) -> MCPConfig:
- """Get MCP configuration for CLI runtime.
-
- Args:
- extra_stdio_servers: Additional stdio servers to include in the config
-
- Returns:
- MCPConfig: The MCP configuration with stdio servers and any configured SSE/SHTTP servers
- """
- # Check if we're on Windows - MCP is disabled on Windows
+ """Get MCP configuration for CLI runtime."""
if sys.platform == 'win32':
self.log('debug', 'MCP is disabled on Windows, returning empty config')
- return MCPConfig(sse_servers=[], stdio_servers=[], shttp_servers=[])
+ return MCPConfig(mcpServers={})
- # Note: we update the self.config.mcp directly for CLI runtime, which is different from other runtimes.
mcp_config = self.config.mcp
- # Add any extra stdio servers
if extra_stdio_servers:
- current_stdio_servers = list(mcp_config.stdio_servers)
- for extra_server in extra_stdio_servers:
- # Check if this stdio server is already in the config
- if extra_server not in current_stdio_servers:
- current_stdio_servers.append(extra_server)
- self.log('info', f'Added extra stdio server: {extra_server.name}')
- mcp_config.stdio_servers = current_stdio_servers
+ merged = dict(mcp_config.mcpServers)
+ for name, server in extra_stdio_servers.items():
+ if name not in merged:
+ merged[name] = server
+ self.log('info', f'Added extra stdio server: {name}')
+ mcp_config = MCPConfig(mcpServers=merged)
+ self.config.mcp = mcp_config
self.log(
'debug',
- f'CLI MCP config: {len(mcp_config.sse_servers)} SSE servers, '
- f'{len(mcp_config.stdio_servers)} stdio servers, '
- f'{len(mcp_config.shttp_servers)} SHTTP servers',
+ f'CLI MCP config: {len(mcp_config.mcpServers)} servers',
)
return mcp_config
diff --git a/openhands/runtime/mcp/proxy/manager.py b/openhands/runtime/mcp/proxy/manager.py
index 21084344eb..b75074ef23 100644
--- a/openhands/runtime/mcp/proxy/manager.py
+++ b/openhands/runtime/mcp/proxy/manager.py
@@ -20,7 +20,7 @@ from fastmcp import FastMCP
from fastmcp.server.auth import StaticTokenVerifier
from fastmcp.utilities.logging import get_logger as fastmcp_get_logger
-from openhands.core.config.mcp_config import MCPStdioServerConfig
+from openhands.core.config.mcp_config import StdioMCPServer
logger = logging.getLogger(__name__)
fastmcp_logger = fastmcp_get_logger('fastmcp')
@@ -137,21 +137,21 @@ class MCPProxyManager:
async def update_and_remount(
self,
app: FastAPI,
- stdio_servers: list[MCPStdioServerConfig],
+ stdio_servers: list[StdioMCPServer],
allow_origins: Optional[list[str]] = None,
) -> None:
"""Update the tools configuration and remount the proxy to the app.
- This is a convenience method that combines updating the tools,
- shutting down the existing proxy, initializing a new one, and
- mounting it to the app.
-
Args:
app: FastAPI application to mount to
- tools: List of tool configurations
+ stdio_servers: List of stdio server configurations (with ``name`` as extra field)
allow_origins: List of allowed origins for CORS
"""
- tools = {t.name: t.model_dump() for t in stdio_servers}
+ tools = {}
+ for t in stdio_servers:
+ dump = t.model_dump()
+ name = dump.pop('name', None) or t.command
+ tools[name] = dump
self.config['mcpServers'] = tools
del self.proxy
diff --git a/openhands/server/conversation_manager/docker_nested_conversation_manager.py b/openhands/server/conversation_manager/docker_nested_conversation_manager.py
index aa8feb477c..a4b4ce71cb 100644
--- a/openhands/server/conversation_manager/docker_nested_conversation_manager.py
+++ b/openhands/server/conversation_manager/docker_nested_conversation_manager.py
@@ -564,7 +564,7 @@ class DockerNestedConversationManager(ConversationManager):
user_id=user_id,
)
llm_registry.retry_listner = session._notify_on_llm_retry
- agent_cls = settings.agent or config.default_agent
+ agent_cls = settings.agent_settings.agent or config.default_agent
agent_config = config.get_agent_config(agent_cls)
agent = Agent.get_cls(agent_cls)(agent_config, llm_registry)
diff --git a/openhands/server/routes/conversation.py b/openhands/server/routes/conversation.py
index 7172f29d18..4aa76a5896 100644
--- a/openhands/server/routes/conversation.py
+++ b/openhands/server/routes/conversation.py
@@ -389,10 +389,7 @@ async def get_microagents(
triggers=[],
inputs=r_agent.metadata.inputs,
tools=(
- [
- server.name
- for server in r_agent.metadata.mcp_tools.stdio_servers
- ]
+ list(r_agent.metadata.mcp_tools.mcpServers.keys())
if r_agent.metadata.mcp_tools
else []
),
@@ -409,10 +406,7 @@ async def get_microagents(
triggers=k_agent.triggers,
inputs=k_agent.metadata.inputs,
tools=(
- [
- server.name
- for server in k_agent.metadata.mcp_tools.stdio_servers
- ]
+ list(k_agent.metadata.mcp_tools.mcpServers.keys())
if k_agent.metadata.mcp_tools
else []
),
diff --git a/openhands/server/routes/manage_conversations.py b/openhands/server/routes/manage_conversations.py
index 5945a626e4..838084f2e9 100644
--- a/openhands/server/routes/manage_conversations.py
+++ b/openhands/server/routes/manage_conversations.py
@@ -22,7 +22,7 @@ import httpx
from fastapi import APIRouter, Depends, Query, Request, status
from fastapi.responses import JSONResponse
from jinja2 import Environment, FileSystemLoader
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, SecretStr
from sqlalchemy.ext.asyncio import AsyncSession
from openhands.app_server.app_conversation.app_conversation_info_service import (
@@ -735,14 +735,17 @@ async def get_prompt(
# placeholder for error handling
raise ValueError('Settings not found')
- settings_base_url = settings.llm_base_url
+ agent_settings = settings.agent_settings
+ settings_base_url = agent_settings.llm.base_url
effective_base_url = get_effective_llm_base_url(
- settings.llm_model,
+ agent_settings.llm.model,
settings_base_url,
)
+ raw_api_key = settings.agent_settings.llm.api_key
+ api_key = SecretStr(raw_api_key) if isinstance(raw_api_key, str) else raw_api_key
llm_config = LLMConfig(
- model=settings.llm_model or '',
- api_key=settings.llm_api_key,
+ model=agent_settings.llm.model,
+ api_key=api_key,
base_url=effective_base_url,
)
diff --git a/openhands/server/routes/settings.py b/openhands/server/routes/settings.py
index f53d978269..bcbb90f542 100644
--- a/openhands/server/routes/settings.py
+++ b/openhands/server/routes/settings.py
@@ -6,24 +6,21 @@
# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
# Tag: Legacy-V0
# This module belongs to the old V0 web server. The V1 application server lives under openhands/app_server/.
-import os
+from typing import Any
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
from fastapi.responses import JSONResponse
-from openhands.app_server.settings.settings_router import (
- load_settings as v1_load_settings,
-)
-from openhands.app_server.settings.settings_router import (
- store_settings as v1_store_settings,
-)
from openhands.app_server.utils.dependencies import get_dependencies
+from openhands.core.logger import openhands_logger as logger
from openhands.integrations.provider import (
PROVIDER_TOKEN_TYPE,
)
+from openhands.server.routes.secrets import invalidate_legacy_secrets_store
from openhands.server.settings import (
GETSettingsModel,
)
+from openhands.server.shared import config
from openhands.server.user_auth import (
get_provider_tokens,
get_secrets_store,
@@ -34,10 +31,6 @@ from openhands.storage.data_models.settings import Settings
from openhands.storage.secrets.secrets_store import SecretsStore
from openhands.storage.settings.settings_store import SettingsStore
-LITE_LLM_API_URL = os.environ.get(
- 'LITE_LLM_API_URL', 'https://llm-proxy.app.all-hands.dev'
-)
-
app = APIRouter(prefix='/api', dependencies=get_dependencies())
@@ -56,9 +49,57 @@ async def load_settings(
settings: Settings = Depends(get_user_settings),
secrets_store: SecretsStore = Depends(get_secrets_store),
) -> GETSettingsModel | JSONResponse:
- return await v1_load_settings(
- provider_tokens, settings_store, settings, secrets_store
- )
+ try:
+ if not settings:
+ return JSONResponse(
+ status_code=status.HTTP_404_NOT_FOUND,
+ content={'error': 'Settings not found'},
+ )
+
+ user_secrets = await invalidate_legacy_secrets_store(
+ settings, settings_store, secrets_store
+ )
+
+ git_providers = (
+ user_secrets.provider_tokens if user_secrets else provider_tokens
+ )
+
+ provider_tokens_set: dict[str, str | None] = {}
+ if git_providers:
+ for provider_type, provider_token in git_providers.items():
+ if provider_token.token or provider_token.user_id:
+ provider_tokens_set[provider_type.value] = provider_token.host
+
+ agent_vals = settings.get_agent_settings_display()
+ settings_payload = settings.model_dump(
+ mode='json', exclude={'agent_settings', 'conversation_settings'}
+ )
+ settings_payload.update(
+ {
+ 'llm_api_key_set': settings.llm_api_key_is_set,
+ 'search_api_key_set': settings.search_api_key is not None
+ and bool(settings.search_api_key),
+ 'provider_tokens_set': provider_tokens_set,
+ 'agent_settings': agent_vals,
+ 'conversation_settings': settings.conversation_settings.model_dump(
+ mode='json'
+ ),
+ 'llm_api_key': None,
+ 'search_api_key': None,
+ 'sandbox_api_key': None,
+ }
+ )
+ return JSONResponse(status_code=status.HTTP_200_OK, content=settings_payload)
+ except Exception as e:
+ logger.warning(f'Invalid token: {e}')
+ user_id = getattr(settings, 'user_id', 'unknown') if settings else 'unknown'
+ logger.info(
+ f'Returning 401 Unauthorized - Invalid token for user_id: {user_id}'
+ )
+ return JSONResponse(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ content={'error': 'Invalid token'},
+ )
@app.post(
@@ -71,7 +112,50 @@ async def load_settings(
deprecated=True,
)
async def store_settings(
- settings: Settings,
+ payload: dict[str, Any],
settings_store: SettingsStore = Depends(get_user_settings_store),
) -> JSONResponse:
- return await v1_store_settings(settings, settings_store)
+ try:
+ existing_settings = await settings_store.load()
+ settings = existing_settings.model_copy() if existing_settings else Settings()
+ settings.update(payload)
+
+ if existing_settings:
+ if 'search_api_key' not in payload and settings.search_api_key is None:
+ settings.search_api_key = existing_settings.search_api_key
+ if settings.user_consents_to_analytics is None:
+ settings.user_consents_to_analytics = (
+ existing_settings.user_consents_to_analytics
+ )
+ if settings.disabled_skills is None:
+ settings.disabled_skills = existing_settings.disabled_skills
+
+ if settings.remote_runtime_resource_factor is not None:
+ config.sandbox.remote_runtime_resource_factor = (
+ settings.remote_runtime_resource_factor
+ )
+
+ git_config_updated = False
+ if settings.git_user_name is not None:
+ config.git_user_name = settings.git_user_name
+ git_config_updated = True
+ if settings.git_user_email is not None:
+ config.git_user_email = settings.git_user_email
+ git_config_updated = True
+
+ if git_config_updated:
+ logger.info(
+ f'Updated global git configuration: name={config.git_user_name}, email={config.git_user_email}'
+ )
+
+ await settings_store.store(settings)
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content={'message': 'Settings stored'},
+ )
+ except Exception as e:
+ logger.warning(f'Something went wrong storing settings: {e}')
+ return JSONResponse(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ content={'error': 'Something went wrong storing settings'},
+ )
diff --git a/openhands/server/services/conversation_service.py b/openhands/server/services/conversation_service.py
index bddf160c1f..4cb7694a67 100644
--- a/openhands/server/services/conversation_service.py
+++ b/openhands/server/services/conversation_service.py
@@ -10,6 +10,8 @@ import uuid
from types import MappingProxyType
from typing import Any
+from pydantic import SecretStr
+
from openhands.core.config.mcp_config import MCPConfig
from openhands.core.logger import openhands_logger as logger
from openhands.events.action.message import MessageAction
@@ -104,22 +106,26 @@ async def start_conversation(
session_init_args: dict[str, Any] = {}
if settings:
- session_init_args = {**settings.__dict__, **session_init_args}
+ session_init_args = settings.model_dump()
+ agent_settings = settings.agent_settings
# We could use litellm.check_valid_key for a more accurate check,
# but that would run a tiny inference.
- model_name = settings.llm_model or ''
+ model_name = agent_settings.llm.model
+ llm_api_key = settings.agent_settings.llm.api_key
is_bedrock_model = model_name.startswith('bedrock/')
is_lemonade_model = model_name.startswith('lemonade/')
+ key_value: str | None = None
+ if isinstance(llm_api_key, SecretStr):
+ key_value = llm_api_key.get_secret_value()
+ elif isinstance(llm_api_key, str):
+ key_value = llm_api_key
if (
not is_bedrock_model
and not is_lemonade_model
- and (
- not settings.llm_api_key
- or settings.llm_api_key.get_secret_value().isspace()
- )
+ and (not key_value or key_value.isspace())
):
- logger.warning(f'Missing api key for model {settings.llm_model}')
+ logger.warning(f'Missing api key for model {model_name}')
raise LLMAuthenticationError(
'Error authenticating with the LLM provider. Please check your API key'
)
@@ -137,7 +143,9 @@ async def start_conversation(
session_init_args['git_provider'] = conversation_metadata.git_provider
session_init_args['conversation_instructions'] = conversation_instructions
if mcp_config:
- session_init_args['mcp_config'] = mcp_config
+ agent_settings_payload = dict(session_init_args.get('agent_settings') or {})
+ agent_settings_payload['mcp_config'] = mcp_config.model_dump(mode='python')
+ session_init_args['agent_settings'] = agent_settings_payload
conversation_init_data = ConversationInitData(**session_init_args)
@@ -244,8 +252,7 @@ async def setup_init_conversation_settings(
'Settings not found', {'msg_id': 'CONFIGURATION$SETTINGS_NOT_FOUND'}
)
- session_init_args: dict = {}
- session_init_args = {**settings.__dict__, **session_init_args}
+ session_init_args: dict = settings.model_dump()
# Use provided tokens if available (for SAAS resume), otherwise create scaffold
if provider_tokens:
diff --git a/openhands/server/session/session.py b/openhands/server/session/session.py
index aaeed22a23..fb273ecb02 100644
--- a/openhands/server/session/session.py
+++ b/openhands/server/session/session.py
@@ -20,7 +20,11 @@ from openhands.core.config.condenser_config import (
ConversationWindowCondenserConfig,
LLMSummarizingCondenserConfig,
)
-from openhands.core.config.mcp_config import OpenHandsMCPConfigImpl
+from openhands.core.config.mcp_config import (
+ MCPConfig,
+ OpenHandsMCPConfigImpl,
+ merge_mcp_configs,
+)
from openhands.core.exceptions import MicroagentValidationError
from openhands.core.logger import OpenHandsLoggerAdapter
from openhands.core.schema import AgentState
@@ -37,13 +41,13 @@ from openhands.events.serialization import event_from_dict, event_to_dict
from openhands.events.stream import EventStreamSubscriber
from openhands.llm.llm_registry import LLMRegistry
from openhands.runtime.runtime_status import RuntimeStatus
-from openhands.sdk.utils.redact import sanitize_dict
from openhands.server.constants import ROOM_KEY
from openhands.server.services.conversation_stats import ConversationStats
from openhands.server.session.agent_session import AgentSession
from openhands.server.session.conversation_init_data import ConversationInitData
from openhands.storage.data_models.settings import Settings
from openhands.storage.files import FileStore
+from openhands.utils._redact_compat import sanitize_dict
class WebSession:
@@ -141,16 +145,13 @@ class WebSession:
AgentStateChangedObservation('', AgentState.LOADING),
EventSource.ENVIRONMENT,
)
- agent_cls = settings.agent or self.config.default_agent
- self.config.security.confirmation_mode = (
- self.config.security.confirmation_mode
- if settings.confirmation_mode is None
- else settings.confirmation_mode
+ agent_settings = settings.agent_settings
+ agent_cls = agent_settings.agent or self.config.default_agent
+ self.config.security.confirmation_mode = bool(
+ settings.conversation_settings.confirmation_mode
)
self.config.security.security_analyzer = (
- self.config.security.security_analyzer
- if settings.security_analyzer is None
- else settings.security_analyzer
+ settings.conversation_settings.security_analyzer
)
self.config.sandbox.base_container_image = (
settings.sandbox_base_container_image
@@ -170,7 +171,9 @@ class WebSession:
git_user_email = getattr(settings, 'git_user_email', None)
if git_user_email is not None:
self.config.git_user_email = git_user_email
- max_iterations = settings.max_iterations or self.config.max_iterations
+ max_iterations = (
+ settings.conversation_settings.max_iterations or self.config.max_iterations
+ )
# Prioritize settings over config for max_budget_per_task
max_budget_per_task = (
@@ -188,28 +191,23 @@ class WebSession:
f'MCP configuration before setup - self.config.mcp_config: {sanitize_dict(self.config.mcp.model_dump())}'
)
- # Check if settings has custom mcp_config
- mcp_config = getattr(settings, 'mcp_config', None)
- if mcp_config is not None:
- # Use the provided MCP SHTTP servers instead of default setup
- self.config.mcp = self.config.mcp.merge(mcp_config)
+ # Merge user's custom MCP servers from settings
+ sdk_mcp = settings.agent_settings.mcp_config
+ if sdk_mcp and sdk_mcp.mcpServers:
+ self.config.mcp = merge_mcp_configs(self.config.mcp, sdk_mcp)
self.logger.debug(
- f'Merged custom MCP Config: {sanitize_dict(mcp_config.model_dump())}'
+ f'Merged custom MCP Config: {sanitize_dict(sdk_mcp.model_dump())}'
)
- # Add OpenHands' MCP server by default
- (
- openhands_mcp_server,
- openhands_mcp_stdio_servers,
- ) = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
+ # Add OpenHands' default MCP servers
+ default_servers = await OpenHandsMCPConfigImpl.create_default_mcp_server_config(
self.config.mcp_host, self.config, self.user_id
)
-
- if openhands_mcp_server:
- self.config.mcp.shttp_servers.append(openhands_mcp_server)
- self.logger.debug('Added default MCP HTTP server to config')
-
- self.config.mcp.stdio_servers.extend(openhands_mcp_stdio_servers)
+ if default_servers:
+ self.config.mcp = MCPConfig(
+ mcpServers={**self.config.mcp.mcpServers, **default_servers}
+ )
+ self.logger.debug('Added default MCP servers to config')
self.logger.debug(
f'MCP configuration after setup - self.config.mcp: {sanitize_dict(self.config.mcp.model_dump())}'
@@ -221,7 +219,7 @@ class WebSession:
agent_config.runtime = self.config.runtime
agent_name = agent_cls if agent_cls is not None else 'agent'
llm_config = self.config.get_llm_config_from_agent(agent_name)
- if settings.enable_default_condenser:
+ if agent_settings.condenser.enabled:
# Default condenser chains three condensers together:
# 1. a conversation window condenser that handles explicit
# condensation requests,
@@ -231,7 +229,6 @@ class WebSession:
# The order matters: with the browser output first, the summarizer
# will only see the most recent browser output, which should keep
# the summarization cost down.
- max_events_for_condenser = settings.condenser_max_size or 240
default_condenser_config = CondenserPipelineConfig(
condensers=[
ConversationWindowCondenserConfig(),
@@ -239,7 +236,7 @@ class WebSession:
LLMSummarizingCondenserConfig(
llm_config=llm_config,
keep_first=4,
- max_size=max_events_for_condenser,
+ max_size=agent_settings.condenser.max_size,
),
]
)
@@ -249,7 +246,7 @@ class WebSession:
f' browser_output_masking(attention_window=2), '
f' llm(model="{llm_config.model}", '
f' base_url="{llm_config.base_url}", '
- f' keep_first=4, max_size={max_events_for_condenser})'
+ f' keep_first=4, max_size={agent_settings.condenser.max_size})'
)
agent_config.condenser = default_condenser_config
agent = Agent.get_cls(agent_cls)(agent_config, self.llm_registry)
diff --git a/openhands/storage/data_models/settings.py b/openhands/storage/data_models/settings.py
index 3c8d15d219..a865e40476 100644
--- a/openhands/storage/data_models/settings.py
+++ b/openhands/storage/data_models/settings.py
@@ -1,8 +1,9 @@
from __future__ import annotations
from enum import Enum
-from typing import Annotated
+from typing import Annotated, Any
+from fastmcp.mcp_config import MCPConfig as SDKMCPConfig
from pydantic import (
BaseModel,
ConfigDict,
@@ -10,14 +11,66 @@ from pydantic import (
SecretStr,
SerializationInfo,
field_serializer,
- field_validator,
model_validator,
)
from openhands.core.config.llm_config import LLMConfig
-from openhands.core.config.mcp_config import MCPConfig
from openhands.core.config.utils import load_openhands_config
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.storage.data_models.secrets import Secrets
+from openhands.utils.jsonpatch_compat import deep_merge
+
+
+def _coerce_value(value: Any) -> Any:
+ """Unwrap SecretStr to plain values."""
+ if isinstance(value, SecretStr):
+ return value.get_secret_value()
+ if isinstance(value, SDKMCPConfig):
+ return value.model_dump(exclude_none=True, exclude_defaults=True) or None
+ return value
+
+
+def _coerce_dict_secrets(d: dict[str, Any]) -> dict[str, Any]:
+ """Recursively coerce SecretStr / MCPConfig leaves to plain values."""
+ out: dict[str, Any] = {}
+ for k, v in d.items():
+ if isinstance(v, dict):
+ out[k] = _coerce_dict_secrets(v)
+ else:
+ out[k] = _coerce_value(v)
+ return out
+
+
+def _merge_sdk_mcp_configs(
+ base_config: SDKMCPConfig | None, extra_config: SDKMCPConfig | None
+) -> SDKMCPConfig | None:
+ if base_config is None:
+ return extra_config
+ if extra_config is None:
+ return base_config
+
+ merged_servers: dict[str, Any] = {}
+
+ def _add_server(server_name: str, server_config: dict[str, Any]) -> None:
+ candidate = server_name or 'server'
+ if candidate not in merged_servers:
+ merged_servers[candidate] = server_config
+ return
+
+ suffix = 1
+ while f'{candidate}_{suffix}' in merged_servers:
+ suffix += 1
+ merged_servers[f'{candidate}_{suffix}'] = server_config
+
+ for config in (base_config, extra_config):
+ raw_config = config.model_dump(exclude_none=True)
+ for server_name, server_config in raw_config.get('mcpServers', {}).items():
+ _add_server(server_name, server_config)
+
+ if not merged_servers:
+ return None
+
+ return SDKMCPConfig.model_validate({'mcpServers': merged_servers})
class SandboxGroupingStrategy(str, Enum):
@@ -34,177 +87,282 @@ class SandboxGroupingStrategy(str, Enum):
ADD_TO_ANY = 'ADD_TO_ANY' # Add to any available sandbox (first found)
+_SETTINGS_FROZEN_FIELDS = frozenset(['secrets_store'])
+
+
class Settings(BaseModel):
- """Persisted settings for OpenHands sessions"""
+ """Persisted settings for OpenHands sessions.
+
+ Agent settings (agent, llm, mcp, condenser) live in ``agent_settings``.
+ Conversation settings (max_iterations, confirmation_mode, security_analyzer)
+ live in ``conversation_settings``.
+ Product settings remain as top-level fields.
+ """
language: str | None = None
- agent: str | None = None
- max_iterations: int | None = None
- security_analyzer: str | None = None
- confirmation_mode: bool | None = None
- llm_model: str | None = None
- llm_api_key: SecretStr | None = None
- llm_base_url: str | None = None
user_version: int | None = None
remote_runtime_resource_factor: int | None = None
# Planned to be removed from settings
secrets_store: Annotated[Secrets, Field(frozen=True)] = Field(
default_factory=Secrets
)
- enable_default_condenser: bool = True
enable_sound_notifications: bool = False
enable_proactive_conversation_starters: bool = True
enable_solvability_analysis: bool = True
user_consents_to_analytics: bool | None = None
sandbox_base_container_image: str | None = None
sandbox_runtime_container_image: str | None = None
- mcp_config: MCPConfig | None = None
disabled_skills: list[str] | None = None
search_api_key: SecretStr | None = None
sandbox_api_key: SecretStr | None = None
max_budget_per_task: float | None = None
- # Maximum number of events in the conversation view before condensation runs
- condenser_max_size: int | None = None
email: str | None = None
email_verified: bool | None = None
git_user_name: str | None = None
git_user_email: str | None = None
v1_enabled: bool = True
+ agent_settings: AgentSettings = Field(default_factory=AgentSettings)
+ conversation_settings: ConversationSettings = Field(
+ default_factory=ConversationSettings
+ )
sandbox_grouping_strategy: SandboxGroupingStrategy = (
SandboxGroupingStrategy.NO_GROUPING
)
- model_config = ConfigDict(
- validate_assignment=True,
- )
+ model_config = ConfigDict(populate_by_name=True)
- @field_serializer('llm_api_key', 'search_api_key')
- def api_key_serializer(self, api_key: SecretStr | None, info: SerializationInfo):
- """Custom serializer for API keys.
+ @property
+ def llm_api_key_is_set(self) -> bool:
+ raw = self.agent_settings.llm.api_key
+ if raw is None:
+ return False
+ secret_value = (
+ raw.get_secret_value() if isinstance(raw, SecretStr) else str(raw)
+ )
+ return bool(secret_value and secret_value.strip())
+
+ # ── Batch update ────────────────────────────────────────────────
- To serialize the API key instead of ********, set expose_secrets to True in the serialization context.
+ def update(self, payload: dict[str, Any]) -> None:
+ """Apply a batch of changes from a nested dict.
+
+ ``agent_settings`` values use nested dict shape (matching model_dump).
+ ``conversation_settings`` values likewise.
+ Top-level keys are set directly on the model.
"""
+ if 'agent_settings' in payload:
+ agent_update = payload['agent_settings']
+ if isinstance(agent_update, dict):
+ coerced: dict[str, Any] = {}
+ for key, value in agent_update.items():
+ coerced[key] = (
+ _coerce_value(value) if not isinstance(value, dict) else value
+ )
+
+ replace_mcp_config = 'mcp_config' in agent_update
+ mcp_config = (
+ coerced.pop('mcp_config', None) if replace_mcp_config else None
+ )
+
+ merged = deep_merge(
+ self.agent_settings.model_dump(
+ mode='json', context={'expose_secrets': True}
+ ),
+ coerced,
+ )
+ if replace_mcp_config:
+ merged['mcp_config'] = mcp_config
+
+ # Use object.__setattr__ to avoid validate_assignment
+ # side-effects on other fields.
+ object.__setattr__(
+ self, 'agent_settings', AgentSettings.model_validate(merged)
+ )
+
+ if 'conversation_settings' in payload:
+ conv_update = payload['conversation_settings']
+ if isinstance(conv_update, dict):
+ merged = deep_merge(
+ self.conversation_settings.model_dump(mode='json'),
+ conv_update,
+ )
+ object.__setattr__(
+ self,
+ 'conversation_settings',
+ ConversationSettings.model_validate(merged),
+ )
+
+ for key, value in payload.items():
+ if key in ('agent_settings', 'conversation_settings'):
+ continue
+ if key in Settings.model_fields and key not in _SETTINGS_FROZEN_FIELDS:
+ field_info = Settings.model_fields[key]
+ # Coerce plain strings to SecretStr when the field type expects it
+ if value is not None and isinstance(value, str):
+ annotation = field_info.annotation
+ if annotation is SecretStr or (
+ hasattr(annotation, '__args__')
+ and SecretStr in getattr(annotation, '__args__', ())
+ ):
+ value = SecretStr(value) if value else None
+ setattr(self, key, value)
+
+ # ── Serialization ───────────────────────────────────────────────
+
+ @field_serializer('search_api_key')
+ def api_key_serializer(self, api_key: SecretStr | None, info: SerializationInfo):
if api_key is None:
return None
-
- # Get the secret value to check if it's empty
secret_value = api_key.get_secret_value()
if not secret_value or not secret_value.strip():
return None
-
context = info.context
if context and context.get('expose_secrets', False):
return secret_value
-
return str(api_key)
+ @field_serializer('agent_settings')
+ def agent_settings_serializer(
+ self, agent_settings: AgentSettings, info: SerializationInfo
+ ) -> dict[str, Any]:
+ context = info.context or {}
+ if context.get('expose_secrets', False):
+ return agent_settings.model_dump(
+ mode='json', context={'expose_secrets': True}
+ )
+ return agent_settings.model_dump(mode='json')
+
@model_validator(mode='before')
@classmethod
- def convert_provider_tokens(cls, data: dict | object) -> dict | object:
- """Convert provider tokens from JSON format to Secrets format."""
+ def _normalize_inputs(cls, data: dict | object) -> dict | object:
+ """Normalize agent_settings and secrets_store inputs."""
if not isinstance(data, dict):
return data
- secrets_store = data.get('secrets_store')
- if not isinstance(secrets_store, dict):
- return data
-
- custom_secrets = secrets_store.get('custom_secrets')
- tokens = secrets_store.get('provider_tokens')
-
- secret_store = Secrets(provider_tokens={}, custom_secrets={}) # type: ignore[arg-type]
-
- if isinstance(tokens, dict):
- converted_store = Secrets(provider_tokens=tokens) # type: ignore[arg-type]
- secret_store = secret_store.model_copy(
- update={'provider_tokens': converted_store.provider_tokens}
+ # --- Agent settings: coerce SecretStr leaves to plain strings ---
+ agent_settings = data.get('agent_settings')
+ if isinstance(agent_settings, dict):
+ data['agent_settings'] = _coerce_dict_secrets(agent_settings)
+ elif isinstance(agent_settings, AgentSettings):
+ data['agent_settings'] = agent_settings.model_dump(
+ mode='json', context={'expose_secrets': True}
)
- else:
- secret_store.model_copy(update={'provider_tokens': tokens})
- if isinstance(custom_secrets, dict):
- converted_store = Secrets(custom_secrets=custom_secrets) # type: ignore[arg-type]
- secret_store = secret_store.model_copy(
- update={'custom_secrets': converted_store.custom_secrets}
+ # --- Conversation settings: normalize ---
+ conversation_settings = data.get('conversation_settings')
+ if isinstance(conversation_settings, ConversationSettings):
+ data['conversation_settings'] = conversation_settings.model_dump(
+ mode='json'
)
- else:
- secret_store = secret_store.model_copy(
- update={'custom_secrets': custom_secrets}
+
+ # --- Secrets store ---
+ secrets_store = data.get('secrets_store')
+ if isinstance(secrets_store, dict):
+ custom_secrets = secrets_store.get('custom_secrets')
+ tokens = secrets_store.get('provider_tokens')
+ secret_store = Secrets.model_validate(
+ {'provider_tokens': {}, 'custom_secrets': {}}
)
- data['secret_store'] = secret_store
- return data
+ if isinstance(tokens, dict):
+ converted_store = Secrets.model_validate({'provider_tokens': tokens})
+ secret_store = secret_store.model_copy(
+ update={'provider_tokens': converted_store.provider_tokens}
+ )
+ if isinstance(custom_secrets, dict):
+ converted_store = Secrets.model_validate(
+ {'custom_secrets': custom_secrets}
+ )
+ secret_store = secret_store.model_copy(
+ update={'custom_secrets': converted_store.custom_secrets}
+ )
+ data['secret_store'] = secret_store
- @field_validator('condenser_max_size')
- @classmethod
- def validate_condenser_max_size(cls, v: int | None) -> int | None:
- if v is None:
- return v
- if v < 20:
- raise ValueError('condenser_max_size must be at least 20')
- return v
+ return data
@field_serializer('secrets_store')
def secrets_store_serializer(self, secrets: Secrets, info: SerializationInfo):
- """Custom serializer for secrets store."""
- """Force invalidate secret store"""
return {'provider_tokens': {}}
+ # ── Factory methods ─────────────────────────────────────────────
+
@staticmethod
def from_config() -> Settings | None:
app_config = load_openhands_config()
llm_config: LLMConfig = app_config.get_llm_config()
if llm_config.api_key is None:
- # If no api key has been set, we take this to mean that there is no reasonable default
return None
- security = app_config.security
- # Get MCP config if available
- mcp_config = None
- if hasattr(app_config, 'mcp'):
- mcp_config = app_config.mcp
+ agent_settings_dict: dict[str, Any] = {
+ 'agent': app_config.default_agent,
+ 'llm': {
+ 'model': llm_config.model,
+ 'api_key': (
+ llm_config.api_key.get_secret_value()
+ if isinstance(llm_config.api_key, SecretStr)
+ else llm_config.api_key
+ ),
+ 'base_url': llm_config.base_url,
+ },
+ }
+ if hasattr(app_config, 'mcp') and app_config.mcp:
+ agent_settings_dict['mcp_config'] = _coerce_value(app_config.mcp)
- settings = Settings(
+ return Settings(
language='en',
- agent=app_config.default_agent,
- max_iterations=app_config.max_iterations,
- security_analyzer=security.security_analyzer,
- confirmation_mode=security.confirmation_mode,
- llm_model=llm_config.model,
- llm_api_key=llm_config.api_key,
- llm_base_url=llm_config.base_url,
remote_runtime_resource_factor=app_config.sandbox.remote_runtime_resource_factor,
- mcp_config=mcp_config,
search_api_key=app_config.search_api_key,
max_budget_per_task=app_config.max_budget_per_task,
+ agent_settings=AgentSettings(**agent_settings_dict),
+ conversation_settings=ConversationSettings.model_validate(
+ {
+ 'confirmation_mode': bool(app_config.security.confirmation_mode),
+ 'security_analyzer': app_config.security.security_analyzer,
+ 'max_iterations': app_config.max_iterations,
+ }
+ ),
)
- return settings
def merge_with_config_settings(self) -> 'Settings':
- """Merge config.toml settings with stored settings.
-
- Config.toml takes priority for MCP settings, but they are merged rather than replaced.
- This method can be used by both server mode and CLI mode.
- """
- # Get config.toml settings
+ """Merge config.toml MCP settings with stored SDK agent_settings."""
config_settings = Settings.from_config()
- if not config_settings or not config_settings.mcp_config:
- return self
-
- # If stored settings don't have MCP config, use config.toml MCP config
- if not self.mcp_config:
- self.mcp_config = config_settings.mcp_config
+ if not config_settings:
return self
- # Both have MCP config - merge them with config.toml taking priority
- merged_mcp = MCPConfig(
- sse_servers=list(config_settings.mcp_config.sse_servers)
- + list(self.mcp_config.sse_servers),
- stdio_servers=list(config_settings.mcp_config.stdio_servers)
- + list(self.mcp_config.stdio_servers),
- shttp_servers=list(config_settings.mcp_config.shttp_servers)
- + list(self.mcp_config.shttp_servers),
+ merged_mcp = _merge_sdk_mcp_configs(
+ config_settings.agent_settings.mcp_config,
+ self.agent_settings.mcp_config,
)
+ if merged_mcp is None:
+ return self
- # Create new settings with merged MCP config
- self.mcp_config = merged_mcp
+ self.agent_settings.mcp_config = merged_mcp
return self
+
+ def to_agent_settings(self) -> AgentSettings:
+ return self.agent_settings
+
+ def get_agent_settings_display(self) -> dict[str, Any]:
+ """Return agent_settings dict with display-friendly model names.
+
+ ``litellm_proxy/`` prefixes are normalised to ``openhands/``.
+ The LiteLLM proxy ``base_url`` is cleared for managed models so
+ that the frontend can display "basic" mode.
+ Secrets are masked by Pydantic's default serialiser.
+ """
+ from openhands.utils.llm import is_openhands_model
+
+ data = self.agent_settings.model_dump(mode='json')
+ llm = data.get('llm')
+ if isinstance(llm, dict):
+ model = llm.get('model')
+ if isinstance(model, str) and model.startswith('litellm_proxy/'):
+ llm['model'] = f'openhands/{model.removeprefix("litellm_proxy/")}'
+ # Clear the proxy base_url for managed models so the frontend
+ # sees null and can display the simple "basic" settings view.
+ if is_openhands_model(model):
+ base_url = llm.get('base_url')
+ if isinstance(base_url, str) and base_url.rstrip('/').endswith(
+ 'llm-proxy.app.all-hands.dev'
+ ):
+ llm['base_url'] = None
+ return data
diff --git a/openhands/storage/settings/file_settings_store.py b/openhands/storage/settings/file_settings_store.py
index 5b43bf6b80..66820fb5cc 100644
--- a/openhands/storage/settings/file_settings_store.py
+++ b/openhands/storage/settings/file_settings_store.py
@@ -31,7 +31,9 @@ class FileSettingsStore(SettingsStore):
return None
async def store(self, settings: Settings) -> None:
- json_str = settings.model_dump_json(context={'expose_secrets': True})
+ json_str = settings.model_dump_json(
+ context={'expose_secrets': True, 'persist_settings': True}
+ )
await call_sync_from_async(self.file_store.write, self.path, json_str)
@classmethod
diff --git a/openhands/utils/conversation_summary.py b/openhands/utils/conversation_summary.py
index 999a5eabea..9cacd41741 100644
--- a/openhands/utils/conversation_summary.py
+++ b/openhands/utils/conversation_summary.py
@@ -2,6 +2,8 @@
from typing import Optional
+from pydantic import SecretStr
+
from openhands.core.config import LLMConfig
from openhands.core.logger import openhands_logger as logger
from openhands.events.action.message import MessageAction
@@ -113,16 +115,22 @@ async def auto_generate_title(
if first_user_message:
# Get LLM config from user settings
try:
- if settings and settings.llm_model:
- # Create LLM config from settings
- settings_base_url = settings.llm_base_url
+ if settings:
+ agent_settings = settings.agent_settings
+ settings_base_url = agent_settings.llm.base_url
effective_base_url = get_effective_llm_base_url(
- settings.llm_model,
+ agent_settings.llm.model,
settings_base_url,
)
+ raw_api_key = settings.agent_settings.llm.api_key
+ api_key = (
+ SecretStr(raw_api_key)
+ if isinstance(raw_api_key, str)
+ else raw_api_key
+ )
llm_config = LLMConfig(
- model=settings.llm_model,
- api_key=settings.llm_api_key,
+ model=agent_settings.llm.model,
+ api_key=api_key,
base_url=effective_base_url,
)
diff --git a/openhands/utils/jsonpatch_compat.py b/openhands/utils/jsonpatch_compat.py
new file mode 100644
index 0000000000..23c0f73f22
--- /dev/null
+++ b/openhands/utils/jsonpatch_compat.py
@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from typing import Any
+
+
+def deep_merge(
+ base: dict[str, Any],
+ updates: dict[str, Any],
+) -> dict[str, Any]:
+ """Recursively merge *updates* into a shallow copy of *base*.
+
+ * Nested dicts are merged recursively.
+ * ``None`` values in *updates* remove the corresponding key.
+ * All other values overwrite.
+ """
+ result: dict[str, Any] = dict(base)
+ for key, value in updates.items():
+ if value is None:
+ result.pop(key, None)
+ elif isinstance(value, dict) and isinstance(result.get(key), dict):
+ result[key] = deep_merge(result[key], value)
+ else:
+ result[key] = value
+ return result
diff --git a/openhands/utils/llm.py b/openhands/utils/llm.py
index 8c23de8d7b..dfdea2a1b1 100644
--- a/openhands/utils/llm.py
+++ b/openhands/utils/llm.py
@@ -95,13 +95,20 @@ class ModelsResponse(BaseModel):
def is_openhands_model(model: str | None) -> bool:
"""Check if the model uses the OpenHands provider.
+ The SDK's ``AgentSettings`` validator automatically transforms
+ ``openhands/X`` to ``litellm_proxy/X`` (the internal proxy name),
+ so both prefixes must be recognised.
+
Args:
model: The model name to check.
Returns:
- True if the model starts with 'openhands/', False otherwise.
+ True if the model starts with 'openhands/' or 'litellm_proxy/',
+ False otherwise.
"""
- return bool(model and model.startswith('openhands/'))
+ return bool(
+ model and (model.startswith('openhands/') or model.startswith('litellm_proxy/'))
+ )
def get_provider_api_base(model: str) -> str | None:
diff --git a/openhands/utils/utils.py b/openhands/utils/utils.py
index 77ae3bae10..923021fa99 100644
--- a/openhands/utils/utils.py
+++ b/openhands/utils/utils.py
@@ -1,6 +1,8 @@
import os
from copy import deepcopy
+from pydantic import SecretStr
+
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.llm.llm_registry import LLMRegistry
from openhands.server.services.conversation_stats import ConversationStats
@@ -13,11 +15,16 @@ def setup_llm_config(config: OpenHandsConfig, settings: Settings) -> OpenHandsCo
# Copying this means that when we update variables they are not applied to the shared global configuration!
config = deepcopy(config)
+ agent_settings = settings.agent_settings
llm_config = config.get_llm_config()
- llm_config.model = settings.llm_model or ''
- llm_config.api_key = settings.llm_api_key
+ llm_config.model = agent_settings.llm.model
+ raw_key = settings.agent_settings.llm.api_key
+ if isinstance(raw_key, str):
+ llm_config.api_key = SecretStr(raw_key)
+ else:
+ llm_config.api_key = raw_key
env_base_url = os.environ.get('LLM_BASE_URL')
- settings_base_url = settings.llm_base_url
+ settings_base_url = agent_settings.llm.base_url
# Use env_base_url if available, otherwise fall back to settings_base_url
base_url_to_use = (
@@ -43,7 +50,7 @@ def create_registry_and_conversation_stats(
if user_settings:
user_config = setup_llm_config(config, user_settings)
- agent_cls = user_settings.agent if user_settings else None
+ agent_cls = user_settings.agent_settings.agent if user_settings else None
llm_registry = LLMRegistry(user_config, agent_cls)
file_store = get_file_store(
file_store_type=config.file_store,
diff --git a/poetry.lock b/poetry.lock
index e7971a03b3..5ddd90e13f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.3.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.
[[package]]
name = "agent-client-protocol"
@@ -3537,7 +3537,7 @@ files = [
[package.dependencies]
googleapis-common-protos = ">=1.5.5"
grpcio = ">=1.67.1"
-protobuf = ">=5.26.1,<6.0.dev0"
+protobuf = ">=5.26.1,<6.0dev"
[[package]]
name = "grpclib"
@@ -3905,7 +3905,7 @@ pfzy = ">=0.3.1,<0.4.0"
prompt-toolkit = ">=3.0.1,<4.0.0"
[package.extras]
-docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17b43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
[[package]]
name = "installer"
@@ -4359,7 +4359,7 @@ fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""}
-jsonschema-specifications = ">=2023.3.6"
+jsonschema-specifications = ">=2023.03.6"
referencing = ">=0.28.4"
rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""}
@@ -4842,7 +4842,7 @@ files = [
]
[package.dependencies]
-certifi = ">=14.5.14"
+certifi = ">=14.05.14"
durationpy = ">=0.7"
google-auth = ">=1.0.1"
oauthlib = ">=3.2.2"
@@ -4936,25 +4936,24 @@ files = [
[[package]]
name = "litellm"
-version = "1.80.10"
+version = "1.83.0"
description = "Library to easily interface with LLM API providers"
optional = false
python-versions = "<4.0,>=3.9"
groups = ["main"]
files = [
- {file = "litellm-1.80.10-py3-none-any.whl", hash = "sha256:9b3e561efaba0eb1291cb1555d3dcb7283cf7f3cb65aadbcdb42e2a8765898c8"},
- {file = "litellm-1.80.10.tar.gz", hash = "sha256:4a4aff7558945c2f7e5c6523e67c1b5525a46b10b0e1ad6b8f847cb13b16779e"},
+ {file = "litellm-1.83.0-py3-none-any.whl", hash = "sha256:88c536d339248f3987571493015784671ba3f193a328e1ea6780dbebaa2094a8"},
+ {file = "litellm-1.83.0.tar.gz", hash = "sha256:860bebc76c4bb27b4cf90b4a77acd66dba25aced37e3db98750de8a1766bfb7a"},
]
[package.dependencies]
aiohttp = ">=3.10"
click = "*"
fastuuid = ">=0.13.0"
-grpcio = {version = ">=1.62.3,<1.68.0", markers = "python_version < \"3.14\""}
httpx = ">=0.23.0"
importlib-metadata = ">=6.8.0"
jinja2 = ">=3.1.2,<4.0.0"
-jsonschema = ">=4.22.0,<5.0.0"
+jsonschema = ">=4.23.0,<5.0.0"
openai = ">=2.8.0"
pydantic = ">=2.5.0,<3.0.0"
python-dotenv = ">=0.2.0"
@@ -4963,9 +4962,11 @@ tokenizers = "*"
[package.extras]
caching = ["diskcache (>=5.6.1,<6.0.0)"]
-extra-proxy = ["azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
+extra-proxy = ["a2a-sdk (>=0.3.22,<0.4.0) ; python_version >= \"3.10\"", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (>=0.11.0,<0.12.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
+google = ["google-cloud-aiplatform (>=1.38.0)"]
+grpc = ["grpcio (>=1.62.3,<1.68.dev0 || >1.71.0,!=1.71.1,!=1.72.0,!=1.72.1,!=1.73.0) ; python_version < \"3.14\"", "grpcio (>=1.75.0) ; python_version >= \"3.14\""]
mlflow = ["mlflow (>3.1.4) ; python_version >= \"3.10\""]
-proxy = ["PyJWT (>=2.10.1,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.25)", "litellm-proxy-extras (==0.4.14)", "mcp (>=1.21.2,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.31.1,<0.32.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
+proxy = ["PyJWT (>=2.12.0,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (>=1.40.76,<2.0.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.35)", "litellm-proxy-extras (>=0.4.62,<0.5.0)", "mcp (>=1.25.0,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "pyroscope-io (>=0.8,<0.9) ; sys_platform != \"win32\"", "python-multipart (>=0.0.20)", "pyyaml (>=6.0.1,<7.0.0)", "rich (>=13.7.1,<14.0.0)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.32.1,<1.0.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
semantic-router = ["semantic-router (>=0.1.12) ; python_version >= \"3.9\" and python_version < \"3.14\""]
utils = ["numpydoc"]
@@ -6579,14 +6580,14 @@ llama = ["llama-index (>=0.12.29,<0.13.0)", "llama-index-core (>=0.12.29,<0.13.0
[[package]]
name = "openhands-agent-server"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_agent_server-1.16.1-py3-none-any.whl", hash = "sha256:015983b300510c9c329c8eace49fbd4117d31d0895a125e419c31a9964be4155"},
- {file = "openhands_agent_server-1.16.1.tar.gz", hash = "sha256:489151d35250a424dede8646396bef7b7095adb25e5c973ca8bc6dcbd19cdf07"},
+ {file = "openhands_agent_server-1.17.0-py3-none-any.whl", hash = "sha256:44336cad001c31caeb516481a5a7aea6dd9b5ab4798461f147b5231668d8fb74"},
+ {file = "openhands_agent_server-1.17.0.tar.gz", hash = "sha256:3a88449a3b9ded653dcd2a8c518810c75602873cf9f7d4e8f9b90fd8fd225652"},
]
[package.dependencies]
@@ -6603,14 +6604,14 @@ wsproto = ">=1.2.0"
[[package]]
name = "openhands-sdk"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands SDK - Core functionality for building AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_sdk-1.16.1-py3-none-any.whl", hash = "sha256:0b487929e03e8c87ac6d99f37ff5314df3db6af70a06b516b0858327f9744f2b"},
- {file = "openhands_sdk-1.16.1.tar.gz", hash = "sha256:12f203c3766800bdf5d9dd4dd0a7988b88e13ff4954b0c208903778111e29567"},
+ {file = "openhands_sdk-1.17.0-py3-none-any.whl", hash = "sha256:3b771e72209453871c3036a562cf33e9ad9642a54bd48edb44f89915ac54709d"},
+ {file = "openhands_sdk-1.17.0.tar.gz", hash = "sha256:3c69df6590f023a514137272d413658848e0d5bc9aecf941b946c8662862779a"},
]
[package.dependencies]
@@ -6620,7 +6621,7 @@ fakeredis = {version = ">=2.32.1", extras = ["lua"]}
fastmcp = ">=3.0.0"
filelock = ">=3.20.1"
httpx = {version = ">=0.27.0", extras = ["socks"]}
-litellm = "1.80.10"
+litellm = ">=1.82.6,<1.82.7 || >1.82.7,<1.82.8 || >1.82.8"
lmnr = ">=0.7.24"
pydantic = ">=2.12.5"
python-frontmatter = ">=1.1.0"
@@ -6633,14 +6634,14 @@ boto3 = ["boto3 (>=1.35.0)"]
[[package]]
name = "openhands-tools"
-version = "1.16.1"
+version = "1.17.0"
description = "OpenHands Tools - Runtime tools for AI agents"
optional = false
python-versions = ">=3.12"
groups = ["main"]
files = [
- {file = "openhands_tools-1.16.1-py3-none-any.whl", hash = "sha256:f7fd1eb205571d02ee480ad71e96cac0c34c57c0938c4074fe135a579a7538d7"},
- {file = "openhands_tools-1.16.1.tar.gz", hash = "sha256:64488f2d7705ff90f4bfb7dfd1a2f1fbb4f379059d96e0073677c168d97135e7"},
+ {file = "openhands_tools-1.17.0-py3-none-any.whl", hash = "sha256:76cd30fcc153627444f18638bcd926c9190989f80a3492381e84a181c021d815"},
+ {file = "openhands_tools-1.17.0.tar.gz", hash = "sha256:4a9d6c1aec00d366d0feb1ac2e9ee9988ad9806a0ef89f7dbe4655644e639d4a"},
]
[package.dependencies]
@@ -7134,7 +7135,6 @@ files = [
{file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"},
{file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"},
]
-markers = {runtime = "sys_platform != \"win32\" and sys_platform != \"emscripten\""}
[package.dependencies]
ptyprocess = ">=0.5"
@@ -7152,7 +7152,7 @@ files = [
]
[package.extras]
-docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17b43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
+docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17-beta.43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"]
[[package]]
name = "pg8000"
@@ -7704,7 +7704,6 @@ files = [
{file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"},
{file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"},
]
-markers = {runtime = "sys_platform != \"win32\" and sys_platform != \"emscripten\" or os_name != \"nt\""}
[[package]]
name = "pure-eval"
@@ -13074,10 +13073,10 @@ files = [
]
[package.dependencies]
-botocore = ">=1.37.4,<2.0a0"
+botocore = ">=1.37.4,<2.0a.0"
[package.extras]
-crt = ["botocore[crt] (>=1.37.4,<2.0a0)"]
+crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"]
[[package]]
name = "scantree"
@@ -15022,7 +15021,7 @@ files = [
]
[package.extras]
-cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b0) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""]
+cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""]
[extras]
third-party-runtimes = ["daytona", "e2b-code-interpreter", "modal", "runloop-api-client"]
@@ -15030,4 +15029,4 @@ third-party-runtimes = ["daytona", "e2b-code-interpreter", "modal", "runloop-api
[metadata]
lock-version = "2.1"
python-versions = "^3.12,<3.14"
-content-hash = "888ee60c315d8a16bdc7d823157a7e730b2fa33920e528abe33d5323b362603b"
+content-hash = "c9e405e6cd0edaa81b220b657624c404c34822c6c98bfbbe3228c1c4b7715256"
diff --git a/pyproject.toml b/pyproject.toml
index 226e3b65ed..8969c20323 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,9 +57,9 @@ dependencies = [
"numpy",
"openai==2.8",
"openhands-aci==0.3.3",
- "openhands-agent-server==1.16.1",
- "openhands-sdk==1.16.1",
- "openhands-tools==1.16.1",
+ "openhands-agent-server==1.17",
+ "openhands-sdk==1.17",
+ "openhands-tools==1.17",
"opentelemetry-api>=1.33.1",
"opentelemetry-exporter-otlp-proto-grpc>=1.33.1",
"orjson>=3.11.6",
@@ -251,9 +251,9 @@ e2b-code-interpreter = { version = "^2.0.0", optional = true }
pybase62 = "^1.0.0"
# V1 dependencies
-openhands-sdk = "1.16.1"
-openhands-agent-server = "1.16.1"
-openhands-tools = "1.16.1"
+openhands-sdk = "1.17.0"
+openhands-agent-server = "1.17.0"
+openhands-tools = "1.17.0"
jwcrypto = ">=1.5.6"
sqlalchemy = { extras = [ "asyncio" ], version = "^2.0.40" }
pg8000 = "^1.31.5"
diff --git a/tests/runtime/test_mcp_action.py b/tests/runtime/test_mcp_action.py
index 6873ead15c..781b508d8f 100644
--- a/tests/runtime/test_mcp_action.py
+++ b/tests/runtime/test_mcp_action.py
@@ -13,7 +13,7 @@ from conftest import (
import openhands
from openhands.core.config import MCPConfig
-from openhands.core.config.mcp_config import MCPSSEServerConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import RemoteMCPServer, StdioMCPServer
from openhands.core.logger import openhands_logger as logger
from openhands.events.action import CmdRunAction, MCPAction
from openhands.events.observation import CmdOutputObservation, MCPObservation
@@ -143,7 +143,7 @@ def test_default_activated_tools():
async def test_fetch_mcp_via_stdio(
temp_dir, runtime_cls, run_as_openhands, dynamic_port
):
- mcp_stdio_server_config = MCPStdioServerConfig(
+ mcp_stdio_server_config = StdioMCPServer(
name='fetch', command='uvx', args=['mcp-server-fetch']
)
override_mcp_config = MCPConfig(stdio_servers=[mcp_stdio_server_config])
@@ -203,8 +203,9 @@ async def test_filesystem_mcp_via_sse(
sse_url = sse_server_info['url']
runtime = None
try:
- mcp_sse_server_config = MCPSSEServerConfig(url=sse_url)
- override_mcp_config = MCPConfig(sse_servers=[mcp_sse_server_config])
+ override_mcp_config = MCPConfig(
+ mcpServers={'fs': RemoteMCPServer(url=sse_url, transport='sse')}
+ )
runtime, config = _load_runtime(
temp_dir,
runtime_cls,
@@ -235,15 +236,11 @@ async def test_both_stdio_and_sse_mcp(
sse_url = sse_server_info['url']
runtime = None
try:
- mcp_sse_server_config = MCPSSEServerConfig(url=sse_url)
-
- # Also add stdio server
- mcp_stdio_server_config = MCPStdioServerConfig(
- name='fetch', command='uvx', args=['mcp-server-fetch']
- )
-
override_mcp_config = MCPConfig(
- sse_servers=[mcp_sse_server_config], stdio_servers=[mcp_stdio_server_config]
+ mcpServers={
+ 'fs': RemoteMCPServer(url=sse_url, transport='sse'),
+ 'fetch': StdioMCPServer(command='uvx', args=['mcp-server-fetch']),
+ }
)
runtime, config = _load_runtime(
temp_dir,
@@ -315,7 +312,7 @@ async def test_microagent_and_one_stdio_mcp_in_config(
):
runtime = None
try:
- filesystem_config = MCPStdioServerConfig(
+ filesystem_config = StdioMCPServer(
name='filesystem',
command='npx',
args=[
@@ -336,7 +333,7 @@ async def test_microagent_and_one_stdio_mcp_in_config(
# but that stdio server is not in the initial config
# Actual invocation of the microagent involves `add_mcp_tools_to_agent`
# which will call `get_mcp_config` with the stdio server from microagent's config
- fetch_config = MCPStdioServerConfig(
+ fetch_config = StdioMCPServer(
name='fetch', command='uvx', args=['mcp-server-fetch']
)
updated_config = runtime.get_mcp_config([fetch_config])
diff --git a/tests/runtime/test_microagent.py b/tests/runtime/test_microagent.py
index c43b55eecd..94cb28d11b 100644
--- a/tests/runtime/test_microagent.py
+++ b/tests/runtime/test_microagent.py
@@ -12,7 +12,7 @@ from conftest import (
)
from openhands.core.config import MCPConfig
-from openhands.core.config.mcp_config import MCPStdioServerConfig
+from openhands.core.config.mcp_config import StdioMCPServer
from openhands.mcp.utils import add_mcp_tools_to_agent
from openhands.microagent.microagent import (
BaseMicroagent,
@@ -396,7 +396,7 @@ async def test_add_mcp_tools_from_microagents():
mock_memory = MagicMock()
# Configure the mock memory to return a microagent MCP config
- mock_stdio_server = MCPStdioServerConfig(
+ mock_stdio_server = StdioMCPServer(
name='test-tool', command='test-command', args=['test-arg1', 'test-arg2']
)
mock_microagent_mcp_config = MCPConfig(stdio_servers=[mock_stdio_server])
diff --git a/tests/unit/app_server/test_app_conversation_service_base.py b/tests/unit/app_server/test_app_conversation_service_base.py
index 23c1eb5a60..b3f55de7ee 100644
--- a/tests/unit/app_server/test_app_conversation_service_base.py
+++ b/tests/unit/app_server/test_app_conversation_service_base.py
@@ -18,7 +18,7 @@ from openhands.app_server.app_conversation.app_conversation_service_base import
)
from openhands.app_server.sandbox.sandbox_models import SandboxInfo
from openhands.app_server.user.user_context import UserContext
-from openhands.sdk.context.skills import Skill
+from openhands.sdk.skills import Skill
class MockUserInfo:
diff --git a/tests/unit/app_server/test_app_conversation_skills_endpoint.py b/tests/unit/app_server/test_app_conversation_skills_endpoint.py
index 6b601cf9db..d78c464958 100644
--- a/tests/unit/app_server/test_app_conversation_skills_endpoint.py
+++ b/tests/unit/app_server/test_app_conversation_skills_endpoint.py
@@ -27,7 +27,7 @@ from openhands.app_server.sandbox.sandbox_models import (
)
from openhands.app_server.sandbox.sandbox_spec_models import SandboxSpecInfo
from openhands.app_server.user.user_context import UserContext
-from openhands.sdk.context.skills import KeywordTrigger, Skill, TaskTrigger
+from openhands.sdk.skills import KeywordTrigger, Skill, TaskTrigger
def _make_service_mock(
@@ -38,7 +38,6 @@ def _make_service_mock(
raise_on_load: bool = False,
):
"""Create a mock service that passes the isinstance check and returns the desired values."""
-
mock_cls = type('AppConversationServiceMock', (MagicMock,), {})
AppConversationServiceBase.register(mock_cls)
diff --git a/tests/unit/app_server/test_live_status_app_conversation_service.py b/tests/unit/app_server/test_live_status_app_conversation_service.py
index 849aedcf88..d6eb2b56ea 100644
--- a/tests/unit/app_server/test_live_status_app_conversation_service.py
+++ b/tests/unit/app_server/test_live_status_app_conversation_service.py
@@ -5,6 +5,7 @@ import json
import os
import zipfile
from datetime import datetime
+from types import SimpleNamespace
from unittest.mock import AsyncMock, Mock, patch
from uuid import uuid4
@@ -22,7 +23,6 @@ from openhands.app_server.app_conversation.app_conversation_models import (
AppConversationStartRequest,
)
from openhands.app_server.app_conversation.live_status_app_conversation_service import (
- PLANNING_AGENT_INSTRUCTION,
LiveStatusAppConversationService,
)
from openhands.app_server.sandbox.sandbox_models import (
@@ -39,11 +39,61 @@ from openhands.integrations.service_types import SuggestedTask, TaskType
from openhands.sdk import Agent, Event
from openhands.sdk.llm import LLM
from openhands.sdk.secret import LookupSecret, StaticSecret
-from openhands.sdk.workspace import LocalWorkspace
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.sdk.workspace.remote.async_remote_workspace import AsyncRemoteWorkspace
from openhands.server.types import AppMode
from openhands.storage.data_models.conversation_metadata import ConversationTrigger
-from openhands.storage.data_models.settings import SandboxGroupingStrategy
+from openhands.storage.data_models.settings import SandboxGroupingStrategy, Settings
+
+
+def _build_test_user_agent_settings(user: SimpleNamespace) -> AgentSettings:
+ llm_vals: dict = {}
+ model = getattr(user, 'llm_model', '') or ''
+ llm_vals['model'] = model
+
+ llm_api_key = getattr(user, 'llm_api_key', None)
+ if llm_api_key:
+ llm_vals['api_key'] = llm_api_key
+
+ llm_base_url = getattr(user, 'llm_base_url', None)
+ if llm_base_url:
+ llm_vals['base_url'] = llm_base_url
+
+ agent_vals: dict = {'llm': llm_vals}
+
+ mcp_config = getattr(user, '_mcp_config', None) or getattr(user, 'mcp_config', None)
+ if mcp_config:
+ agent_vals['mcp_config'] = mcp_config.model_dump(mode='python')
+
+ return Settings(agent_settings=agent_vals).agent_settings
+
+
+class _TestUserInfo(SimpleNamespace):
+ @property
+ def agent_settings(self) -> AgentSettings:
+ override = getattr(self, '_agent_settings_override', None)
+ if override is not None:
+ return override
+ return _build_test_user_agent_settings(self)
+
+ @agent_settings.setter
+ def agent_settings(self, value):
+ object.__setattr__(self, '_agent_settings_override', value)
+
+ @property
+ def conversation_settings(self) -> ConversationSettings:
+ kwargs: dict = {
+ 'confirmation_mode': getattr(self, 'confirmation_mode', False),
+ 'security_analyzer': getattr(self, 'security_analyzer', None),
+ }
+ max_iter = getattr(self, 'max_iterations', None)
+ if max_iter is not None:
+ kwargs['max_iterations'] = max_iter
+ return ConversationSettings(**kwargs)
+
+ def to_agent_settings(self) -> AgentSettings:
+ return self.agent_settings
+
# Env var used by openhands SDK LLM to skip context-window validation (e.g. for gpt-4 in tests)
_ALLOW_SHORT_CONTEXT_WINDOWS = 'ALLOW_SHORT_CONTEXT_WINDOWS'
@@ -105,18 +155,18 @@ class TestLiveStatusAppConversationService:
)
# Mock user info
- self.mock_user = Mock()
- self.mock_user.id = 'test_user_123'
- self.mock_user.llm_model = 'gpt-4'
- self.mock_user.llm_base_url = 'https://api.openai.com/v1'
- self.mock_user.llm_api_key = 'test_api_key'
- # Use ADD_TO_ANY for tests to maintain old behavior
- self.mock_user.sandbox_grouping_strategy = SandboxGroupingStrategy.ADD_TO_ANY
- self.mock_user.confirmation_mode = False
- self.mock_user.search_api_key = None # Default to None
- self.mock_user.condenser_max_size = None # Default to None
- self.mock_user.llm_base_url = 'https://api.openai.com/v1'
- self.mock_user.mcp_config = None # Default to None to avoid error handling path
+ self.mock_user = _TestUserInfo(
+ id='test_user_123',
+ llm_model='gpt-4',
+ llm_base_url='https://api.openai.com/v1',
+ llm_api_key='test_api_key',
+ sandbox_grouping_strategy=SandboxGroupingStrategy.ADD_TO_ANY,
+ confirmation_mode=False,
+ security_analyzer='llm',
+ search_api_key=None,
+ mcp_config=None,
+ disabled_skills=[],
+ )
# Mock sandbox
self.mock_sandbox = Mock(spec=SandboxInfo)
@@ -500,8 +550,25 @@ class TestLiveStatusAppConversationService:
)
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_openhands_model_prefers_user_base_url(self):
- """openhands/* model uses user.llm_base_url when provided."""
+ async def test_configure_llm_and_mcp_uses_user_llm_settings(self):
+ """User LLM fields should drive the configured LLM."""
+ self.mock_user.llm_model = 'sdk-model'
+ self.mock_user.llm_base_url = 'https://sdk-llm.example.com'
+ self.mock_user.llm_api_key = 'test-key'
+ self.mock_user_context.get_mcp_api_key.return_value = None
+
+ llm, _ = await self.service._configure_llm_and_mcp(
+ self.mock_user, None, self.conversation_id
+ )
+
+ assert llm.model == 'sdk-model'
+ assert llm.base_url == 'https://sdk-llm.example.com'
+
+ @pytest.mark.asyncio
+ async def test_configure_llm_and_mcp_openhands_model_uses_user_base_url(
+ self,
+ ):
+ """openhands/* model uses user's base_url when set."""
# Arrange
self.mock_user.llm_model = 'openhands/special'
self.mock_user.llm_base_url = 'https://user-llm.example.com'
@@ -512,12 +579,14 @@ class TestLiveStatusAppConversationService:
self.mock_user, self.mock_user.llm_model, self.conversation_id
)
- # Assert
+ # Assert — user base_url takes precedence for openhands/ models
assert llm.base_url == 'https://user-llm.example.com'
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_openhands_model_uses_provider_default(self):
- """openhands/* model falls back to configured provider base URL."""
+ async def test_configure_llm_and_mcp_openhands_model_falls_back_to_provider_url(
+ self,
+ ):
+ """openhands/* model falls back to provider base URL when user has no base_url."""
# Arrange
self.mock_user.llm_model = 'openhands/default'
self.mock_user.llm_base_url = None
@@ -528,12 +597,12 @@ class TestLiveStatusAppConversationService:
self.mock_user, self.mock_user.llm_model, self.conversation_id
)
- # Assert
+ # Assert — falls back to service-level openhands_provider_base_url
assert llm.base_url == 'https://provider.example.com'
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_openhands_model_no_base_urls(self):
- """openhands/* model sets base_url to None when no sources available."""
+ """openhands/* model still uses the SDK proxy when no other URLs exist."""
# Arrange
self.mock_user.llm_model = 'openhands/default'
self.mock_user.llm_base_url = None
@@ -852,392 +921,160 @@ class TestLiveStatusAppConversationService:
assert path == '/workspace/project/agents-tmp-config/PLAN.md'
@patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
- )
- @patch(
- 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
- )
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
- )
- def test_create_agent_with_context_planning_agent(
- self, mock_format_plan, mock_create_condenser, mock_get_tools
- ):
- """Test _create_agent_with_context for planning agent type."""
- # Arrange
- mock_llm = Mock(spec=LLM)
- mock_llm.model_copy.return_value = mock_llm
- mock_get_tools.return_value = []
- mock_condenser = Mock()
- mock_create_condenser.return_value = mock_condenser
- mock_format_plan.return_value = 'test_plan_structure'
- mcp_config = {'default': {'url': 'test'}}
- system_message_suffix = 'Test suffix'
- working_dir = '/workspace/project'
- git_provider = ProviderType.GITHUB
-
- # Act
- with patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
- ) as mock_agent_class:
- mock_agent_instance = Mock()
- mock_agent_instance.model_copy.return_value = mock_agent_instance
- mock_agent_class.return_value = mock_agent_instance
-
- self.service._create_agent_with_context(
- mock_llm,
- AgentType.PLAN,
- system_message_suffix,
- mcp_config,
- self.mock_user.condenser_max_size,
- git_provider=git_provider,
- working_dir=working_dir,
- )
-
- # Assert
- mock_get_tools.assert_called_once_with(
- plan_path='/workspace/project/.agents_tmp/PLAN.md'
- )
- mock_agent_class.assert_called_once()
- call_kwargs = mock_agent_class.call_args[1]
- assert call_kwargs['llm'] == mock_llm
- assert call_kwargs['system_prompt_filename'] == 'system_prompt_planning.j2'
- assert (
- call_kwargs['system_prompt_kwargs']['plan_structure']
- == 'test_plan_structure'
- )
- assert call_kwargs['mcp_config'] == mcp_config
- assert call_kwargs['condenser'] == mock_condenser
- mock_create_condenser.assert_called_once_with(
- mock_llm, AgentType.PLAN, self.mock_user.condenser_max_size
- )
-
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools'
- )
- @patch(
- 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
- )
- def test_create_agent_with_context_default_agent(
- self, mock_create_condenser, mock_get_tools
- ):
- """Test _create_agent_with_context for default agent type."""
- # Arrange
- mock_llm = Mock(spec=LLM)
- mock_llm.model_copy.return_value = mock_llm
- mock_get_tools.return_value = []
- mock_condenser = Mock()
- mock_create_condenser.return_value = mock_condenser
- mcp_config = {'default': {'url': 'test'}}
-
- # Act
- with patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
- ) as mock_agent_class:
- mock_agent_instance = Mock()
- mock_agent_instance.model_copy.return_value = mock_agent_instance
- mock_agent_class.return_value = mock_agent_instance
-
- self.service._create_agent_with_context(
- mock_llm,
- AgentType.DEFAULT,
- None,
- mcp_config,
- self.mock_user.condenser_max_size,
- )
-
- # Assert
- mock_agent_class.assert_called_once()
- call_kwargs = mock_agent_class.call_args[1]
- assert call_kwargs['llm'] == mock_llm
- assert call_kwargs['system_prompt_kwargs']['cli_mode'] is False
- assert call_kwargs['mcp_config'] == mcp_config
- assert call_kwargs['condenser'] == mock_condenser
- mock_get_tools.assert_called_once_with(enable_browser=True)
- mock_create_condenser.assert_called_once_with(
- mock_llm, AgentType.DEFAULT, self.mock_user.condenser_max_size
- )
-
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
- )
- @patch(
- 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
- )
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
- )
- def test_create_agent_with_context_planning_agent_applies_instruction(
- self, mock_format_plan, mock_create_condenser, mock_get_tools
- ):
- """Test _create_agent_with_context applies PLANNING_AGENT_INSTRUCTION for plan agents."""
- # Arrange
- mock_llm = Mock(spec=LLM)
- mock_llm.model_copy.return_value = mock_llm
- mock_get_tools.return_value = []
- mock_condenser = Mock()
- mock_create_condenser.return_value = mock_condenser
- mock_format_plan.return_value = 'test_plan_structure'
- mcp_config = {}
-
- # Act
- with patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
- ) as mock_agent_class:
- mock_agent_instance = Mock()
- mock_agent_instance.model_copy.return_value = mock_agent_instance
- mock_agent_class.return_value = mock_agent_instance
-
- self.service._create_agent_with_context(
- mock_llm,
- AgentType.PLAN,
- None, # No existing suffix
- mcp_config,
- self.mock_user.condenser_max_size,
- )
-
- # Assert - verify model_copy was called with agent_context containing planning instruction
- model_copy_call = mock_agent_instance.model_copy.call_args
- agent_context = model_copy_call[1]['update']['agent_context']
- assert agent_context.system_message_suffix == PLANNING_AGENT_INSTRUCTION
-
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_planning_tools'
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
)
- @patch(
- 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
- )
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.format_plan_structure'
- )
- def test_create_agent_with_context_planning_agent_prepends_to_existing_suffix(
- self, mock_format_plan, mock_create_condenser, mock_get_tools
- ):
- """Test _create_agent_with_context prepends planning instruction to existing suffix."""
- # Arrange
- mock_llm = Mock(spec=LLM)
- mock_llm.model_copy.return_value = mock_llm
- mock_get_tools.return_value = []
- mock_condenser = Mock()
- mock_create_condenser.return_value = mock_condenser
- mock_format_plan.return_value = 'test_plan_structure'
- mcp_config = {}
- existing_suffix = 'Custom user instruction from integration'
-
- # Act
- with patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
- ) as mock_agent_class:
- mock_agent_instance = Mock()
- mock_agent_instance.model_copy.return_value = mock_agent_instance
- mock_agent_class.return_value = mock_agent_instance
-
- self.service._create_agent_with_context(
- mock_llm,
- AgentType.PLAN,
- existing_suffix,
- mcp_config,
- self.mock_user.condenser_max_size,
- )
-
- # Assert - verify planning instruction is prepended to existing suffix
- model_copy_call = mock_agent_instance.model_copy.call_args
- agent_context = model_copy_call[1]['update']['agent_context']
- assert agent_context.system_message_suffix.startswith(
- PLANNING_AGENT_INSTRUCTION
- )
- assert existing_suffix in agent_context.system_message_suffix
-
- @patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools'
- )
- @patch(
- 'openhands.app_server.app_conversation.app_conversation_service_base.AppConversationServiceBase._create_condenser'
- )
- def test_create_agent_with_context_default_agent_no_planning_instruction(
- self, mock_create_condenser, mock_get_tools
- ):
- """Test _create_agent_with_context does NOT add planning instruction for default agent."""
- # Arrange
- mock_llm = Mock(spec=LLM)
- mock_llm.model_copy.return_value = mock_llm
- mock_get_tools.return_value = []
- mock_condenser = Mock()
- mock_create_condenser.return_value = mock_condenser
- mcp_config = {}
-
- # Act
- with patch(
- 'openhands.app_server.app_conversation.live_status_app_conversation_service.Agent'
- ) as mock_agent_class:
- mock_agent_instance = Mock()
- mock_agent_instance.model_copy.return_value = mock_agent_instance
- mock_agent_class.return_value = mock_agent_instance
-
- self.service._create_agent_with_context(
- mock_llm,
- AgentType.DEFAULT,
- None,
- mcp_config,
- self.mock_user.condenser_max_size,
- )
-
- # Assert - verify no planning instruction for default agent
- model_copy_call = mock_agent_instance.model_copy.call_args
- agent_context = model_copy_call[1]['update']['agent_context']
- assert agent_context.system_message_suffix is None
-
@pytest.mark.asyncio
- async def test_finalize_conversation_request_with_skills(self):
- """Test _finalize_conversation_request with skills loading."""
- # Create mock LLM with required attributes for _update_agent_with_llm_metadata
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4' # Non-openhands model, so no metadata update
- mock_llm.usage_id = 'agent'
+ async def test_build_request_with_skills(self, _mock_tools):
+ """Skills are loaded when a remote_workspace is provided."""
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- # Arrange
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
mock_agent = Mock(spec=Agent)
- mock_agent.llm = mock_llm
- mock_agent.condenser = None # No condenser
-
- conversation_id = uuid4()
- workspace = LocalWorkspace(working_dir='/test')
- initial_message = Mock(spec=SendMessageRequest)
- secrets = {'test': StaticSecret(value='secret')}
- remote_workspace = Mock(spec=AsyncRemoteWorkspace)
+ mock_agent.llm = real_llm
+ mock_agent.condenser = None
- # Mock the skills loading method
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
self.service._load_skills_and_update_agent = AsyncMock(return_value=mock_agent)
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- initial_message,
- secrets,
- self.mock_sandbox,
- remote_workspace,
- 'test_repo',
- '/test/dir',
+ remote_workspace = Mock(spec=AsyncRemoteWorkspace)
+ conversation_id = uuid4()
+
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=conversation_id,
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/test/dir',
+ remote_workspace=remote_workspace,
+ selected_repository='test_repo',
)
- # Assert
assert isinstance(result, StartConversationRequest)
assert result.conversation_id == conversation_id
- assert result.workspace == workspace
- assert result.initial_message == initial_message
- assert result.secrets == secrets
-
self.service._load_skills_and_update_agent.assert_called_once()
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_finalize_conversation_request_without_skills(self):
- """Test _finalize_conversation_request without remote workspace (no skills)."""
- # Create mock LLM with required attributes for _update_agent_with_llm_metadata
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4' # Non-openhands model, so no metadata update
- mock_llm.usage_id = 'agent'
+ async def test_build_request_without_remote_workspace(self, _mock_tools):
+ """Skills loading is skipped when no remote_workspace is provided."""
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_agent.llm = mock_llm
- mock_agent.condenser = None # No condenser
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
+
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {'test': StaticSecret(value='secret')}
conversation_id = uuid4()
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=conversation_id,
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/test/dir',
+ remote_workspace=None,
)
- # Assert
assert isinstance(result, StartConversationRequest)
assert result.conversation_id == conversation_id
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_finalize_conversation_request_skills_loading_fails(self):
- """Test _finalize_conversation_request when skills loading fails."""
- # Create mock LLM with required attributes for _update_agent_with_llm_metadata
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4' # Non-openhands model, so no metadata update
- mock_llm.usage_id = 'agent'
-
- mock_agent = Mock(spec=Agent)
- mock_agent.llm = mock_llm
- mock_agent.condenser = None # No condenser
+ async def test_build_request_skills_loading_fails_gracefully(self, _mock_tools):
+ """Conversation still starts when skills loading raises."""
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {'test': StaticSecret(value='secret')}
- remote_workspace = Mock(spec=AsyncRemoteWorkspace)
- conversation_id = uuid4()
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- # Mock skills loading to raise an exception
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
self.service._load_skills_and_update_agent = AsyncMock(
side_effect=Exception('Skills loading failed')
)
- # Note: hooks loading is already mocked in setup_method() to return None
+ remote_workspace = Mock(spec=AsyncRemoteWorkspace)
+ conversation_id = uuid4()
- # Act
with patch(
'openhands.app_server.app_conversation.live_status_app_conversation_service._logger'
) as mock_logger:
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- remote_workspace,
- 'test_repo',
- '/test/dir',
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=conversation_id,
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/test/dir',
+ remote_workspace=remote_workspace,
+ selected_repository='test_repo',
)
- # Assert
assert isinstance(result, StartConversationRequest)
mock_logger.warning.assert_called_once()
+ def test_apply_server_overrides_sets_condenser_usage_id(self):
+ """Condenser LLM must get usage_id='condenser' even when it inherits 'agent'."""
+ from openhands.sdk.context.condenser import LLMSummarizingCondenser
+
+ llm = LLM(model='openhands/gpt-4', api_key='k', usage_id='agent')
+ condenser = LLMSummarizingCondenser(llm=llm)
+ agent = Agent(llm=llm, tools=[], condenser=condenser)
+
+ updated = self.service._apply_server_agent_overrides(
+ agent, AgentType.DEFAULT, {}, uuid4(), 'user-1'
+ )
+
+ assert updated.llm.usage_id == 'agent'
+ assert updated.condenser.llm.usage_id == 'condenser'
+
+ def test_apply_server_overrides_condenser_non_openhands_model(self):
+ """Condenser usage_id is set even for non-openhands models (no metadata)."""
+ from openhands.sdk.context.condenser import LLMSummarizingCondenser
+
+ llm = LLM(model='gpt-4', api_key='k', usage_id='agent')
+ condenser = LLMSummarizingCondenser(llm=llm)
+ agent = Agent(llm=llm, tools=[], condenser=condenser)
+
+ updated = self.service._apply_server_agent_overrides(
+ agent, AgentType.DEFAULT, {}, uuid4(), 'user-1'
+ )
+
+ # Non-openhands model: main LLM unchanged, but condenser still gets usage_id
+ assert updated.condenser.llm.usage_id == 'condenser'
+
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_build_start_conversation_request_for_user_integration(self):
+ async def test_build_start_conversation_request_for_user_integration(
+ self, _mock_tools
+ ):
"""Test the main _build_start_conversation_request_for_user method integration."""
- # Arrange
self.mock_user_context.get_user_info.return_value = self.mock_user
- # Mock all the helper methods
- mock_secrets = {'GITHUB_TOKEN': Mock()}
- mock_llm = Mock(spec=LLM)
+ mock_secrets = {'GITHUB_TOKEN': StaticSecret(value=SecretStr('tok'))}
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
mock_mcp_config = {'default': {'url': 'test'}}
- mock_agent = Mock(spec=Agent)
- mock_final_request = Mock(spec=StartConversationRequest)
test_conversation_id = uuid4()
self.service._setup_secrets_for_git_providers = AsyncMock(
return_value=mock_secrets
)
self.service._configure_llm_and_mcp = AsyncMock(
- return_value=(mock_llm, mock_mcp_config)
- )
- self.service._create_agent_with_context = Mock(return_value=mock_agent)
- self.service._finalize_conversation_request = AsyncMock(
- return_value=mock_final_request
+ return_value=(real_llm, mock_mcp_config)
)
- # Act
result = await self.service._build_start_conversation_request_for_user(
sandbox=self.mock_sandbox,
conversation_id=test_conversation_id,
@@ -1251,8 +1088,15 @@ class TestLiveStatusAppConversationService:
selected_repository='test/repo',
)
- # Assert
- assert result == mock_final_request
+ assert isinstance(result, StartConversationRequest)
+ assert result.conversation_id == test_conversation_id
+ assert result.agent.llm.model == 'gpt-4'
+ # Secrets are injected via agent_context
+ assert result.agent.agent_context.secrets == mock_secrets
+ # System message suffix is passed through
+ assert result.agent.agent_context.system_message_suffix == 'Test suffix'
+ # Workspace points to the repo subdirectory
+ assert result.workspace.working_dir == '/test/dir/repo'
self.service._setup_secrets_for_git_providers.assert_called_once_with(
self.mock_user
@@ -1260,24 +1104,6 @@ class TestLiveStatusAppConversationService:
self.service._configure_llm_and_mcp.assert_called_once_with(
self.mock_user, 'gpt-4', test_conversation_id
)
- # When selected_repository='test/repo', project_dir is resolved
- # to '/test/dir/repo' via get_project_dir. All downstream calls
- # (agent context, workspace, skills) must use this path.
- self.service._create_agent_with_context.assert_called_once_with(
- mock_llm,
- AgentType.DEFAULT,
- 'Test suffix',
- mock_mcp_config,
- self.mock_user.condenser_max_size,
- secrets=mock_secrets,
- git_provider=ProviderType.GITHUB,
- working_dir='/test/dir/repo',
- )
- self.service._finalize_conversation_request.assert_called_once()
- assert (
- self.service._finalize_conversation_request.call_args.args[1]
- == test_conversation_id
- )
@pytest.mark.asyncio
async def test_find_running_sandbox_for_user_found(self):
@@ -1751,113 +1577,82 @@ class TestLiveStatusAppConversationService:
assert saved_info.id == conversation_id
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_with_custom_sse_servers(self):
- """Test _configure_llm_and_mcp merges custom SSE servers with UUID-based names."""
- # Arrange
-
- from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+ async def test_configure_llm_and_mcp_with_custom_remote_servers(self):
+ """Test _configure_llm_and_mcp merges custom remote servers."""
+ from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
self.mock_user.mcp_config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='https://linear.app/sse', api_key='linear_key'),
- MCPSSEServerConfig(url='https://notion.com/sse'),
- ]
+ mcpServers={
+ 'linear': RemoteMCPServer(
+ url='https://linear.app/sse', transport='sse', auth='linear_key'
+ ),
+ 'notion': RemoteMCPServer(
+ url='https://notion.com/sse', transport='sse'
+ ),
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
assert isinstance(llm, LLM)
assert 'mcpServers' in mcp_config
- # Should have default server + 2 custom SSE servers
mcp_servers = mcp_config['mcpServers']
assert 'default' in mcp_servers
-
- # Find SSE servers (they have sse_ prefix)
- sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
- assert len(sse_servers) == 2
-
- # Verify SSE server configurations
- for server_name, server_config in sse_servers.items():
- assert server_name.startswith('sse_')
- assert len(server_name) > 4 # Has UUID suffix
- assert 'url' in server_config
- assert 'transport' in server_config
- assert server_config['transport'] == 'sse'
-
- # Check if this is the Linear server (has headers)
- if 'headers' in server_config:
- assert server_config['headers']['Authorization'] == 'Bearer linear_key'
+ assert 'linear' in mcp_servers
+ assert 'notion' in mcp_servers
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_with_custom_shttp_servers(self):
- """Test _configure_llm_and_mcp merges custom SHTTP servers with timeout."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPSHTTPServerConfig
+ async def test_configure_llm_and_mcp_with_custom_http_servers(self):
+ """Test _configure_llm_and_mcp merges custom HTTP servers with timeout."""
+ from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
self.mock_user.mcp_config = MCPConfig(
- shttp_servers=[
- MCPSHTTPServerConfig(
+ mcpServers={
+ 'custom-http': RemoteMCPServer(
url='https://example.com/mcp',
- api_key='test_key',
+ transport='http',
+ auth='test_key',
timeout=120,
)
- ]
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
assert isinstance(llm, LLM)
mcp_servers = mcp_config['mcpServers']
-
- # Find SHTTP servers
- shttp_servers = {k: v for k, v in mcp_servers.items() if k.startswith('shttp_')}
- assert len(shttp_servers) == 1
-
- server_config = list(shttp_servers.values())[0]
- assert server_config['url'] == 'https://example.com/mcp'
- assert server_config['transport'] == 'streamable-http'
- assert server_config['headers']['Authorization'] == 'Bearer test_key'
- assert server_config['timeout'] == 120
+ assert 'custom-http' in mcp_servers
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_with_custom_stdio_servers(self):
"""Test _configure_llm_and_mcp merges custom STDIO servers with explicit names."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+ from openhands.core.config.mcp_config import MCPConfig, StdioMCPServer
self.mock_user.mcp_config = MCPConfig(
- stdio_servers=[
- MCPStdioServerConfig(
- name='my-custom-server',
+ mcpServers={
+ 'my-custom-server': StdioMCPServer(
command='npx',
args=['-y', 'my-package'],
env={'API_KEY': 'secret'},
)
- ]
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
assert isinstance(llm, LLM)
mcp_servers = mcp_config['mcpServers']
- # STDIO server should use its explicit name
assert 'my-custom-server' in mcp_servers
server_config = mcp_servers['my-custom-server']
assert server_config['command'] == 'npx'
@@ -1867,54 +1662,47 @@ class TestLiveStatusAppConversationService:
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_merges_system_and_custom_servers(self):
"""Test _configure_llm_and_mcp merges both system and custom MCP servers."""
- # Arrange
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
self.mock_user.search_api_key = SecretStr('tavily_key')
self.mock_user.mcp_config = MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='https://custom.com/sse')],
- stdio_servers=[
- MCPStdioServerConfig(
- name='custom-stdio', command='node', args=['app.js']
- )
- ],
+ mcpServers={
+ 'custom-sse': RemoteMCPServer(
+ url='https://custom.com/sse', transport='sse'
+ ),
+ 'custom-stdio': StdioMCPServer(command='node', args=['app.js']),
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = 'mcp_api_key'
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- # Should have system servers
assert 'default' in mcp_servers
assert 'tavily' in mcp_servers
-
- # Should have custom SSE server with UUID name
- sse_servers = [k for k in mcp_servers if k.startswith('sse_')]
- assert len(sse_servers) == 1
-
- # Should have custom STDIO server with explicit name
+ assert 'custom-sse' in mcp_servers
assert 'custom-stdio' in mcp_servers
- # Total: default + tavily + 1 SSE + 1 STDIO = 4 servers
assert len(mcp_servers) == 4
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_custom_config_error_handling(self):
- """Test _configure_llm_and_mcp handles errors in custom MCP config gracefully."""
+ """Test _configure_llm_and_mcp handles invalid custom MCP config gracefully."""
# Arrange
- self.mock_user.mcp_config = Mock()
- # Simulate error when accessing sse_servers
- self.mock_user.mcp_config.sse_servers = property(
- lambda self: (_ for _ in ()).throw(Exception('Config error'))
+ invalid_mcp_config = Mock()
+ invalid_mcp_config.model_dump.return_value = 'not-a-dict'
+ self.mock_user._agent_settings_override = SimpleNamespace(
+ mcp_config=invalid_mcp_config
+ )
+ self.service._configure_llm = Mock(
+ return_value=LLM.model_validate({'model': 'gpt-4', 'usage_id': 'agent'})
)
self.mock_user_context.get_mcp_api_key.return_value = None
@@ -1927,7 +1715,6 @@ class TestLiveStatusAppConversationService:
assert isinstance(llm, LLM)
mcp_servers = mcp_config['mcpServers']
assert 'default' in mcp_servers
- # Custom servers should not be added due to error
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_sdk_format_with_mcpservers_wrapper(self):
@@ -1952,198 +1739,150 @@ class TestLiveStatusAppConversationService:
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_empty_custom_config(self):
"""Test _configure_llm_and_mcp handles empty custom MCP config."""
- # Arrange
from openhands.core.config.mcp_config import MCPConfig
- self.mock_user.mcp_config = MCPConfig(
- sse_servers=[], stdio_servers=[], shttp_servers=[]
- )
+ self.mock_user.mcp_config = MCPConfig(mcpServers={})
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- # Should only have system default server
assert 'default' in mcp_servers
assert len(mcp_servers) == 1
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_sse_server_without_api_key(self):
- """Test _configure_llm_and_mcp handles SSE servers without API keys."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+ async def test_configure_llm_and_mcp_remote_server_without_auth(self):
+ """Test _configure_llm_and_mcp handles remote servers without auth."""
+ from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
self.mock_user.mcp_config = MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='https://public.com/sse')]
+ mcpServers={
+ 'public': RemoteMCPServer(url='https://public.com/sse', transport='sse')
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
-
- # Server should exist but without headers
- assert len(sse_servers) == 1
- server_config = list(sse_servers.values())[0]
- assert 'headers' not in server_config
- assert server_config['url'] == 'https://public.com/sse'
- assert server_config['transport'] == 'sse'
+ assert 'public' in mcp_servers
@pytest.mark.asyncio
- async def test_configure_llm_and_mcp_shttp_server_without_timeout(self):
- """Test _configure_llm_and_mcp handles SHTTP servers without timeout."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPSHTTPServerConfig
+ async def test_configure_llm_and_mcp_http_server_default_timeout(self):
+ """Test _configure_llm_and_mcp handles HTTP servers with default timeout."""
+ from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
self.mock_user.mcp_config = MCPConfig(
- shttp_servers=[MCPSHTTPServerConfig(url='https://example.com/mcp')]
+ mcpServers={
+ 'http-server': RemoteMCPServer(
+ url='https://example.com/mcp', transport='http'
+ )
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- shttp_servers = {k: v for k, v in mcp_servers.items() if k.startswith('shttp_')}
-
- assert len(shttp_servers) == 1
- server_config = list(shttp_servers.values())[0]
- # Timeout should be included even if None (defaults to 60)
- assert 'timeout' in server_config
+ assert 'http-server' in mcp_servers
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_stdio_server_without_env(self):
"""Test _configure_llm_and_mcp handles STDIO servers without environment variables."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+ from openhands.core.config.mcp_config import MCPConfig, StdioMCPServer
self.mock_user.mcp_config = MCPConfig(
- stdio_servers=[
- MCPStdioServerConfig(
- name='simple-server', command='node', args=['app.js']
- )
- ]
+ mcpServers={
+ 'simple-server': StdioMCPServer(command='node', args=['app.js'])
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
assert 'simple-server' in mcp_servers
server_config = mcp_servers['simple-server']
-
- # Should not have env key if not provided
- assert 'env' not in server_config
assert server_config['command'] == 'node'
assert server_config['args'] == ['app.js']
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_multiple_servers_same_type(self):
"""Test _configure_llm_and_mcp handles multiple custom servers of the same type."""
- # Arrange
- from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+ from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
self.mock_user.mcp_config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='https://server1.com/sse'),
- MCPSSEServerConfig(url='https://server2.com/sse'),
- MCPSSEServerConfig(url='https://server3.com/sse'),
- ]
+ mcpServers={
+ 'server1': RemoteMCPServer(
+ url='https://server1.com/sse', transport='sse'
+ ),
+ 'server2': RemoteMCPServer(
+ url='https://server2.com/sse', transport='sse'
+ ),
+ 'server3': RemoteMCPServer(
+ url='https://server3.com/sse', transport='sse'
+ ),
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- sse_servers = {k: v for k, v in mcp_servers.items() if k.startswith('sse_')}
-
- # All 3 servers should be present with unique UUID-based names
- assert len(sse_servers) == 3
-
- # Verify all have unique names
- server_names = list(sse_servers.keys())
- assert len(set(server_names)) == 3 # All names are unique
- # Verify all URLs are preserved
- urls = [v['url'] for v in sse_servers.values()]
- assert 'https://server1.com/sse' in urls
- assert 'https://server2.com/sse' in urls
- assert 'https://server3.com/sse' in urls
+ assert 'server1' in mcp_servers
+ assert 'server2' in mcp_servers
+ assert 'server3' in mcp_servers
@pytest.mark.asyncio
async def test_configure_llm_and_mcp_mixed_server_types(self):
- """Test _configure_llm_and_mcp handles all three server types together."""
- # Arrange
+ """Test _configure_llm_and_mcp handles all server types together."""
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSHTTPServerConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
self.mock_user.mcp_config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='https://sse.example.com/sse', api_key='sse_key')
- ],
- shttp_servers=[
- MCPSHTTPServerConfig(url='https://shttp.example.com/mcp', timeout=90)
- ],
- stdio_servers=[
- MCPStdioServerConfig(
- name='stdio-server',
+ mcpServers={
+ 'sse-server': RemoteMCPServer(
+ url='https://sse.example.com/sse',
+ transport='sse',
+ auth='sse_key',
+ ),
+ 'http-server': RemoteMCPServer(
+ url='https://shttp.example.com/mcp',
+ transport='http',
+ timeout=90,
+ ),
+ 'stdio-server': StdioMCPServer(
command='npx',
args=['mcp-server'],
env={'TOKEN': 'value'},
- )
- ],
+ ),
+ }
)
self.mock_user_context.get_mcp_api_key.return_value = None
- # Act
llm, mcp_config = await self.service._configure_llm_and_mcp(
self.mock_user, None, self.conversation_id
)
- # Assert
mcp_servers = mcp_config['mcpServers']
- # Check all server types are present
- sse_count = len([k for k in mcp_servers if k.startswith('sse_')])
- shttp_count = len([k for k in mcp_servers if k.startswith('shttp_')])
- stdio_count = 1 if 'stdio-server' in mcp_servers else 0
-
- assert sse_count == 1
- assert shttp_count == 1
- assert stdio_count == 1
-
- # Verify each type has correct configuration
- sse_server = next(v for k, v in mcp_servers.items() if k.startswith('sse_'))
- assert sse_server['transport'] == 'sse'
- assert sse_server['headers']['Authorization'] == 'Bearer sse_key'
-
- shttp_server = next(v for k, v in mcp_servers.items() if k.startswith('shttp_'))
- assert shttp_server['transport'] == 'streamable-http'
- assert shttp_server['timeout'] == 90
+ assert 'sse-server' in mcp_servers
+ assert 'http-server' in mcp_servers
+ assert 'stdio-server' in mcp_servers
stdio_server = mcp_servers['stdio-server']
assert stdio_server['command'] == 'npx'
@@ -2174,8 +1913,12 @@ class TestLiveStatusAppConversationService:
assert get_project_dir('/workspace/project', None) == '/workspace/project'
assert get_project_dir('/workspace/project', '') == '/workspace/project'
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_build_request_workspace_uses_project_dir(self):
+ async def test_build_request_workspace_uses_project_dir(self, _mock_tools):
"""workspace.working_dir in StartConversationRequest must equal project_dir.
This is the root cause of the V1 hook-stop bug: if workspace.working_dir
@@ -2185,29 +1928,12 @@ class TestLiveStatusAppConversationService:
"""
self.mock_user_context.get_user_info.return_value = self.mock_user
- mock_secrets = {'GITHUB_TOKEN': Mock()}
- mock_llm = Mock(spec=LLM)
- mock_agent = Mock(spec=Agent)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- self.service._setup_secrets_for_git_providers = AsyncMock(
- return_value=mock_secrets
- )
- self.service._configure_llm_and_mcp = AsyncMock(return_value=(mock_llm, {}))
- self.service._create_agent_with_context = Mock(return_value=mock_agent)
-
- captured = {}
-
- async def capture_finalize(
- agent, conversation_id, user, workspace, *args, **kwargs
- ):
- captured['workspace_working_dir'] = workspace.working_dir
- return Mock(spec=StartConversationRequest)
-
- self.service._finalize_conversation_request = AsyncMock(
- side_effect=capture_finalize
- )
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- await self.service._build_start_conversation_request_for_user(
+ result = await self.service._build_start_conversation_request_for_user(
sandbox=self.mock_sandbox,
conversation_id=uuid4(),
initial_message=None,
@@ -2218,33 +1944,24 @@ class TestLiveStatusAppConversationService:
)
assert (
- captured['workspace_working_dir'] == '/workspace/project/software-agent-sdk'
+ result.workspace.working_dir == '/workspace/project/software-agent-sdk'
), 'workspace.working_dir must point to the repo root, not the sandbox mount'
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_build_request_no_repo_workspace_unchanged(self):
+ async def test_build_request_no_repo_workspace_unchanged(self, _mock_tools):
"""Without selected_repository, workspace.working_dir == sandbox working_dir."""
self.mock_user_context.get_user_info.return_value = self.mock_user
- self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
- self.service._configure_llm_and_mcp = AsyncMock(
- return_value=(Mock(spec=LLM), {})
- )
- self.service._create_agent_with_context = Mock(return_value=Mock(spec=Agent))
-
- captured = {}
-
- async def capture_finalize(
- agent, conversation_id, user, workspace, *args, **kwargs
- ):
- captured['workspace_working_dir'] = workspace.working_dir
- return Mock(spec=StartConversationRequest)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- self.service._finalize_conversation_request = AsyncMock(
- side_effect=capture_finalize
- )
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- await self.service._build_start_conversation_request_for_user(
+ result = await self.service._build_start_conversation_request_for_user(
sandbox=self.mock_sandbox,
conversation_id=uuid4(),
initial_message=None,
@@ -2254,7 +1971,7 @@ class TestLiveStatusAppConversationService:
selected_repository=None,
)
- assert captured['workspace_working_dir'] == '/workspace/project'
+ assert result.workspace.working_dir == '/workspace/project'
@pytest.mark.asyncio
async def test_search_app_conversations_with_sandbox_id_filter(self):
@@ -2413,16 +2130,16 @@ class TestPluginHandling:
)
# Mock user info
- self.mock_user = Mock()
- self.mock_user.id = 'test_user_123'
- self.mock_user.llm_model = 'gpt-4'
- self.mock_user.llm_base_url = 'https://api.openai.com/v1'
- self.mock_user.llm_api_key = 'test_api_key'
- self.mock_user.confirmation_mode = False
- self.mock_user.search_api_key = None
- self.mock_user.condenser_max_size = None
- self.mock_user.mcp_config = None
- self.mock_user.security_analyzer = None
+ self.mock_user = _TestUserInfo(
+ id='test_user_123',
+ llm_model='gpt-4',
+ llm_base_url='https://api.openai.com/v1',
+ llm_api_key='test_api_key',
+ confirmation_mode=False,
+ search_api_key=None,
+ mcp_config=None,
+ security_analyzer=None,
+ )
# Mock sandbox
self.mock_sandbox = Mock(spec=SandboxInfo)
@@ -2602,28 +2319,22 @@ class TestPluginHandling:
assert 'key2: value2' in text
@pytest.mark.asyncio
- async def test_finalize_conversation_request_with_plugins(self):
- """Test _finalize_conversation_request passes plugins list to StartConversationRequest."""
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
+ async def test_build_request_with_plugins(self, _mock_tools):
+ """Plugins are converted to PluginSource and included in the request."""
from openhands.app_server.app_conversation.app_conversation_models import (
PluginSpec,
)
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4'
- mock_llm.usage_id = 'agent'
- mock_agent.llm = mock_llm
- mock_agent.condenser = None
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- mock_updated_agent = Mock(spec=Agent)
- mock_updated_agent.llm = mock_llm
- mock_updated_agent.condenser = None
- mock_agent.model_copy = Mock(return_value=mock_updated_agent)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {'test': StaticSecret(value='secret')}
- conversation_id = uuid4()
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
plugins = [
PluginSpec(
@@ -2633,149 +2344,72 @@ class TestPluginHandling:
)
]
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=uuid4(),
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/workspace',
plugins=plugins,
)
- # Assert
assert isinstance(result, StartConversationRequest)
assert result.plugins is not None
assert len(result.plugins) == 1
assert result.plugins[0].source == 'github:owner/my-plugin'
assert result.plugins[0].ref == 'v1.0.0'
- # Also verify initial message contains plugin params
+ # Plugin params are folded into the initial message
assert result.initial_message is not None
assert (
'Plugin Configuration Parameters:' in result.initial_message.content[0].text
)
assert '- api_key: test123' in result.initial_message.content[0].text
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_finalize_conversation_request_without_plugins(self):
- """Test _finalize_conversation_request without plugins sets plugins to None."""
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4'
- mock_llm.usage_id = 'agent'
- mock_agent.llm = mock_llm
- mock_agent.condenser = None
+ async def test_build_request_without_plugins(self, _mock_tools):
+ """Without plugins, result.plugins is None."""
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- mock_updated_agent = Mock(spec=Agent)
- mock_updated_agent.llm = mock_llm
- mock_updated_agent.condenser = None
- mock_agent.model_copy = Mock(return_value=mock_updated_agent)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {}
- conversation_id = uuid4()
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
- plugins=None,
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=uuid4(),
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/workspace',
)
- # Assert
assert isinstance(result, StartConversationRequest)
assert result.plugins is None
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_finalize_conversation_request_plugin_without_ref(self):
- """Test _finalize_conversation_request with plugin that has no ref."""
- from openhands.app_server.app_conversation.app_conversation_models import (
- PluginSpec,
- )
-
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4'
- mock_llm.usage_id = 'agent'
- mock_agent.llm = mock_llm
- mock_agent.condenser = None
-
- mock_updated_agent = Mock(spec=Agent)
- mock_updated_agent.llm = mock_llm
- mock_updated_agent.condenser = None
- mock_agent.model_copy = Mock(return_value=mock_updated_agent)
-
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {}
- conversation_id = uuid4()
-
- # Plugin without ref or parameters
- plugins = [PluginSpec(source='github:owner/my-plugin')]
-
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
- plugins=plugins,
- )
-
- # Assert
- assert isinstance(result, StartConversationRequest)
- assert result.plugins is not None
- assert len(result.plugins) == 1
- assert result.plugins[0].source == 'github:owner/my-plugin'
- assert result.plugins[0].ref is None
- # No parameters, so initial message should be None
- assert result.initial_message is None
-
- @pytest.mark.asyncio
- async def test_finalize_conversation_request_plugin_with_repo_path(self):
- """Test _finalize_conversation_request passes repo_path to PluginSource."""
+ async def test_build_request_plugin_with_repo_path(self, _mock_tools):
+ """repo_path is propagated through to PluginSource."""
from openhands.app_server.app_conversation.app_conversation_models import (
PluginSpec,
)
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4'
- mock_llm.usage_id = 'agent'
- mock_agent.llm = mock_llm
- mock_agent.condenser = None
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- mock_updated_agent = Mock(spec=Agent)
- mock_updated_agent.llm = mock_llm
- mock_updated_agent.condenser = None
- mock_agent.model_copy = Mock(return_value=mock_updated_agent)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {}
- conversation_id = uuid4()
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- # Plugin with repo_path (for marketplace repos containing multiple plugins)
plugins = [
PluginSpec(
source='github:owner/marketplace-repo',
@@ -2784,54 +2418,40 @@ class TestPluginHandling:
)
]
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=uuid4(),
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/workspace',
plugins=plugins,
)
- # Assert
- assert isinstance(result, StartConversationRequest)
assert result.plugins is not None
assert len(result.plugins) == 1
assert result.plugins[0].source == 'github:owner/marketplace-repo'
assert result.plugins[0].ref == 'main'
assert result.plugins[0].repo_path == 'plugins/city-weather'
+ @patch(
+ 'openhands.app_server.app_conversation.live_status_app_conversation_service.get_default_tools',
+ return_value=[],
+ )
@pytest.mark.asyncio
- async def test_finalize_conversation_request_multiple_plugins(self):
- """Test _finalize_conversation_request with multiple plugins."""
+ async def test_build_request_multiple_plugins(self, _mock_tools):
+ """Multiple plugins are all converted correctly."""
from openhands.app_server.app_conversation.app_conversation_models import (
PluginSpec,
)
- # Arrange
- mock_agent = Mock(spec=Agent)
- mock_llm = Mock(spec=LLM)
- mock_llm.model = 'gpt-4'
- mock_llm.usage_id = 'agent'
- mock_agent.llm = mock_llm
- mock_agent.condenser = None
+ self.mock_user_context.get_user_info.return_value = self.mock_user
- mock_updated_agent = Mock(spec=Agent)
- mock_updated_agent.llm = mock_llm
- mock_updated_agent.condenser = None
- mock_agent.model_copy = Mock(return_value=mock_updated_agent)
+ real_llm = LLM(model='gpt-4', api_key=SecretStr('test-key'))
- workspace = LocalWorkspace(working_dir='/test')
- secrets = {}
- conversation_id = uuid4()
+ self.service._setup_secrets_for_git_providers = AsyncMock(return_value={})
+ self.service._configure_llm_and_mcp = AsyncMock(return_value=(real_llm, {}))
- # Multiple plugins
plugins = [
PluginSpec(source='github:owner/security-plugin', ref='v2.0.0'),
PluginSpec(
@@ -2841,23 +2461,16 @@ class TestPluginHandling:
PluginSpec(source='/local/path/to/plugin'),
]
- # Act
- result = await self.service._finalize_conversation_request(
- mock_agent,
- conversation_id,
- self.mock_user,
- workspace,
- None,
- secrets,
- self.mock_sandbox,
- None,
- None,
- '/test/dir',
+ result = await self.service._build_start_conversation_request_for_user(
+ sandbox=self.mock_sandbox,
+ conversation_id=uuid4(),
+ initial_message=None,
+ system_message_suffix=None,
+ git_provider=None,
+ working_dir='/workspace',
plugins=plugins,
)
- # Assert
- assert isinstance(result, StartConversationRequest)
assert result.plugins is not None
assert len(result.plugins) == 3
assert result.plugins[0].source == 'github:owner/security-plugin'
@@ -2866,75 +2479,6 @@ class TestPluginHandling:
assert result.plugins[1].repo_path == 'plugins/logging'
assert result.plugins[2].source == '/local/path/to/plugin'
- @pytest.mark.asyncio
- async def test_build_start_conversation_request_for_user_with_plugins(self):
- """Test _build_start_conversation_request_for_user passes plugins to finalize method."""
- from openhands.app_server.app_conversation.app_conversation_models import (
- PluginSpec,
- )
-
- # Arrange
- self.mock_user_context.get_user_info.return_value = self.mock_user
- self.mock_user_context.get_secrets.return_value = {}
- self.mock_user_context.get_provider_tokens = AsyncMock(return_value=None)
- self.mock_user_context.get_mcp_api_key.return_value = None
-
- plugins = [
- PluginSpec(
- source='https://github.com/org/plugin.git',
- ref='main',
- parameters={'config_file': 'custom.yaml'},
- )
- ]
-
- # Mock _finalize_conversation_request to capture the call
- mock_finalize = AsyncMock(return_value=Mock(spec=StartConversationRequest))
- self.service._finalize_conversation_request = mock_finalize
-
- # Act
- await self.service._build_start_conversation_request_for_user(
- sandbox=self.mock_sandbox,
- conversation_id=uuid4(),
- initial_message=None,
- system_message_suffix=None,
- git_provider=None,
- working_dir='/workspace',
- plugins=plugins,
- )
-
- # Assert
- mock_finalize.assert_called_once()
- call_kwargs = mock_finalize.call_args.kwargs
- assert call_kwargs['plugins'] == plugins
-
- @pytest.mark.asyncio
- async def test_build_start_conversation_request_for_user_without_plugins(self):
- """Test _build_start_conversation_request_for_user works without plugins."""
- # Arrange
- self.mock_user_context.get_user_info.return_value = self.mock_user
- self.mock_user_context.get_secrets.return_value = {}
- self.mock_user_context.get_provider_tokens = AsyncMock(return_value=None)
- self.mock_user_context.get_mcp_api_key.return_value = None
-
- # Mock _finalize_conversation_request
- mock_finalize = AsyncMock(return_value=Mock(spec=StartConversationRequest))
- self.service._finalize_conversation_request = mock_finalize
-
- # Act
- await self.service._build_start_conversation_request_for_user(
- sandbox=self.mock_sandbox,
- conversation_id=uuid4(),
- initial_message=None,
- system_message_suffix=None,
- git_provider=None,
- working_dir='/workspace',
- )
-
- # Assert
- mock_finalize.assert_called_once()
- call_kwargs = mock_finalize.call_args.kwargs
- assert call_kwargs.get('plugins') is None
-
class TestPluginSpecModel:
"""Test cases for the PluginSpec model."""
diff --git a/tests/unit/app_server/test_sandbox_secrets_router.py b/tests/unit/app_server/test_sandbox_secrets_router.py
index 02b7875d6b..65ca901f21 100644
--- a/tests/unit/app_server/test_sandbox_secrets_router.py
+++ b/tests/unit/app_server/test_sandbox_secrets_router.py
@@ -34,7 +34,9 @@ from openhands.app_server.user.user_models import UserInfo
from openhands.app_server.user.user_router import get_current_user
from openhands.integrations.provider import ProviderHandler, ProviderToken
from openhands.integrations.service_types import ProviderType
+from openhands.sdk.llm import LLM
from openhands.sdk.secret import StaticSecret
+from openhands.sdk.settings import AgentSettings
SANDBOX_ID = 'sb-test-123'
USER_ID = 'test-user-id'
@@ -156,9 +158,13 @@ class TestGetCurrentUserExposeSecrets:
"""With valid session key, expose_secrets=true returns unmasked llm_api_key."""
user_info = UserInfo(
id=USER_ID,
- llm_model='anthropic/claude-sonnet-4-20250514',
- llm_api_key=SecretStr('sk-test-key-123'),
- llm_base_url='https://litellm.example.com',
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='anthropic/claude-sonnet-4-20250514',
+ api_key=SecretStr('sk-test-key-123'),
+ base_url='https://litellm.example.com',
+ ),
+ ),
)
mock_context = AsyncMock()
mock_context.get_user_info = AsyncMock(return_value=user_info)
@@ -174,13 +180,13 @@ class TestGetCurrentUserExposeSecrets:
x_session_api_key='valid-key',
)
- # JSONResponse — parse the body
import json
body = json.loads(result.body)
- assert body['llm_model'] == 'anthropic/claude-sonnet-4-20250514'
- assert body['llm_api_key'] == 'sk-test-key-123'
- assert body['llm_base_url'] == 'https://litellm.example.com'
+ sdk_vals = body['agent_settings']
+ assert sdk_vals['llm']['model'] == 'anthropic/claude-sonnet-4-20250514'
+ assert sdk_vals['llm']['api_key'] == 'sk-test-key-123'
+ assert sdk_vals['llm']['base_url'] == 'https://litellm.example.com'
async def test_expose_secrets_rejects_missing_session_key(self):
"""expose_secrets=true without X-Session-API-Key is rejected."""
@@ -232,7 +238,9 @@ class TestGetCurrentUserExposeSecrets:
"""Without expose_secrets, llm_api_key is masked (no session key needed)."""
user_info = UserInfo(
id=USER_ID,
- llm_api_key=SecretStr('sk-test-key-123'),
+ agent_settings=AgentSettings(
+ llm=LLM(model='gpt-4o', api_key=SecretStr('sk-test-key-123')),
+ ),
)
mock_context = AsyncMock()
mock_context.get_user_info = AsyncMock(return_value=user_info)
@@ -243,10 +251,9 @@ class TestGetCurrentUserExposeSecrets:
# Returns UserInfo directly (FastAPI will serialize with masking)
assert isinstance(result, UserInfo)
- assert result.llm_api_key is not None
- # The raw value is still in the object, but serialization masks it
dumped = result.model_dump(mode='json')
- assert dumped['llm_api_key'] == '**********'
+ assert dumped['agent_settings']['llm']['api_key'] != 'sk-test-key-123'
+ assert dumped['agent_settings']['llm']['api_key'] == '**********'
# ---------------------------------------------------------------------------
@@ -445,7 +452,12 @@ class TestExposeSecretsIntegration:
"""Bearer token alone cannot expose secrets (no X-Session-API-Key)."""
mock_user_ctx = AsyncMock()
mock_user_ctx.get_user_info = AsyncMock(
- return_value=UserInfo(id=USER_ID, llm_api_key=SecretStr('sk-secret-123'))
+ return_value=UserInfo(
+ id=USER_ID,
+ agent_settings=AgentSettings(
+ llm=LLM(model='gpt-4o', api_key=SecretStr('sk-secret-123')),
+ ),
+ )
)
mock_user_ctx.get_user_id = AsyncMock(return_value=USER_ID)
@@ -461,7 +473,12 @@ class TestExposeSecretsIntegration:
"""Invalid session key (no matching sandbox) is rejected."""
mock_user_ctx = AsyncMock()
mock_user_ctx.get_user_info = AsyncMock(
- return_value=UserInfo(id=USER_ID, llm_api_key=SecretStr('sk-secret-123'))
+ return_value=UserInfo(
+ id=USER_ID,
+ agent_settings=AgentSettings(
+ llm=LLM(model='gpt-4o', api_key=SecretStr('sk-secret-123')),
+ ),
+ )
)
mock_user_ctx.get_user_id = AsyncMock(return_value=USER_ID)
@@ -488,7 +505,12 @@ class TestExposeSecretsIntegration:
"""Session key from a different user's sandbox is rejected."""
mock_user_ctx = AsyncMock()
mock_user_ctx.get_user_info = AsyncMock(
- return_value=UserInfo(id='user-A', llm_api_key=SecretStr('sk-secret-123'))
+ return_value=UserInfo(
+ id='user-A',
+ agent_settings=AgentSettings(
+ llm=LLM(model='gpt-4o', api_key=SecretStr('sk-secret-123')),
+ ),
+ )
)
mock_user_ctx.get_user_id = AsyncMock(return_value='user-A')
@@ -521,9 +543,13 @@ class TestExposeSecretsIntegration:
mock_user_ctx.get_user_info = AsyncMock(
return_value=UserInfo(
id=USER_ID,
- llm_model='anthropic/claude-sonnet-4-20250514',
- llm_api_key=SecretStr('sk-real-secret'),
- llm_base_url='https://litellm.example.com',
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='anthropic/claude-sonnet-4-20250514',
+ api_key=SecretStr('sk-real-secret'),
+ base_url='https://litellm.example.com',
+ ),
+ ),
)
)
mock_user_ctx.get_user_id = AsyncMock(return_value=USER_ID)
@@ -548,17 +574,23 @@ class TestExposeSecretsIntegration:
)
assert response.status_code == 200
- body = response.json()
- assert body['llm_api_key'] == 'sk-real-secret'
- assert body['llm_model'] == 'anthropic/claude-sonnet-4-20250514'
- assert body['llm_base_url'] == 'https://litellm.example.com'
+ user = UserInfo.model_validate_json(response.text)
+ assert user.agent_settings.llm.api_key.get_secret_value() == 'sk-real-secret'
+ assert user.agent_settings.llm.model == 'anthropic/claude-sonnet-4-20250514'
+ assert user.agent_settings.llm.base_url == 'https://litellm.example.com'
def test_default_masks_secrets_via_http(self):
- """Without expose_secrets, secrets are masked even via real HTTP."""
+ """Without expose_secrets, secrets are in agent_settings."""
mock_user_ctx = AsyncMock()
mock_user_ctx.get_user_info = AsyncMock(
return_value=UserInfo(
- id=USER_ID, llm_api_key=SecretStr('sk-should-be-masked')
+ id=USER_ID,
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='gpt-4o',
+ api_key=SecretStr('sk-should-be-masked'),
+ ),
+ ),
)
)
@@ -568,8 +600,9 @@ class TestExposeSecretsIntegration:
response = client.get('/api/v1/users/me')
assert response.status_code == 200
- body = response.json()
- assert body['llm_api_key'] == '**********'
+ user = UserInfo.model_validate_json(response.text)
+ # Masked secrets are stripped to None on deserialization
+ assert user.agent_settings.llm.api_key is None
class TestSandboxSecretsIntegration:
diff --git a/tests/unit/app_server/test_settings_api.py b/tests/unit/app_server/test_settings_api.py
index 8af3360050..61091fa1fc 100644
--- a/tests/unit/app_server/test_settings_api.py
+++ b/tests/unit/app_server/test_settings_api.py
@@ -8,17 +8,31 @@ from pydantic import SecretStr
from openhands.integrations.provider import ProviderToken, ProviderType
from openhands.integrations.service_types import UserGitInfo
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import (
+ AgentSettings,
+ ConversationSettings,
+ VerificationSettings,
+)
from openhands.server.app import app
from openhands.server.user_auth.user_auth import UserAuth
from openhands.storage.data_models.secrets import Secrets
+from openhands.storage.data_models.settings import Settings
from openhands.storage.memory import InMemoryFileStore
from openhands.storage.secrets.secrets_store import SecretsStore
from openhands.storage.settings.file_settings_store import FileSettingsStore
from openhands.storage.settings.settings_store import SettingsStore
+_EXPOSE = {'expose_secrets': True}
+
+
+def _dump(settings: Settings) -> dict:
+ """Dump settings to a JSON-compatible dict with secrets exposed."""
+ return settings.model_dump(mode='json', context=_EXPOSE, exclude_unset=True)
+
class MockUserAuth(UserAuth):
- """Mock implementation of UserAuth for testing"""
+ """Mock implementation of UserAuth for testing."""
def __init__(self):
self._settings = None
@@ -68,7 +82,11 @@ class MockUserAuth(UserAuth):
def test_client():
# Create a test client
with (
- patch.dict(os.environ, {'SESSION_API_KEY': ''}, clear=False),
+ patch.dict(
+ os.environ,
+ {'SESSION_API_KEY': '', 'ALLOW_SHORT_CONTEXT_WINDOWS': 'true'},
+ clear=False,
+ ),
patch('openhands.app_server.utils.dependencies._SESSION_API_KEY', None),
patch(
'openhands.server.user_auth.user_auth.UserAuth.get_instance',
@@ -83,119 +101,201 @@ def test_client():
yield client
+def test_get_agent_settings_schema_includes_critic_verification_fields(test_client):
+ response = test_client.get('/api/v1/settings/agent-schema')
+
+ assert response.status_code == 200
+ schema = response.json()
+ section_keys = [s['key'] for s in schema['sections']]
+ assert 'verification' in section_keys
+ section = next(s for s in schema['sections'] if s['key'] == 'verification')
+ field_keys = [f['key'] for f in section['fields']]
+ assert 'verification.critic_enabled' in field_keys
+ assert 'confirmation_mode' not in field_keys
+ assert 'security_analyzer' not in field_keys
+
+
+def test_get_conversation_settings_schema_endpoint(test_client):
+ response = test_client.get('/api/v1/settings/conversation-schema')
+
+ assert response.status_code == 200
+ schema = response.json()
+ assert schema['model_name'] == 'ConversationSettings'
+ section_keys = [s['key'] for s in schema['sections']]
+ assert section_keys == ['general', 'verification']
+ verification_section = next(
+ s for s in schema['sections'] if s['key'] == 'verification'
+ )
+ field_keys = [f['key'] for f in verification_section['fields']]
+ assert 'confirmation_mode' in field_keys
+ assert 'security_analyzer' in field_keys
+
+
@pytest.mark.asyncio
async def test_settings_api_endpoints(test_client):
- """Test that the settings API endpoints work with the new auth system"""
- # Test data with remote_runtime_resource_factor
- settings_data = {
- 'language': 'en',
- 'agent': 'test-agent',
- 'max_iterations': 100,
- 'security_analyzer': 'default',
- 'confirmation_mode': True,
- 'llm_model': 'test-model',
- 'llm_api_key': 'test-key',
- 'llm_base_url': 'https://test.com',
- 'remote_runtime_resource_factor': 2,
- }
+ """Test that the settings API endpoints work with the new auth system."""
+ settings = Settings(
+ language='en',
+ remote_runtime_resource_factor=2,
+ agent_settings=AgentSettings(
+ agent='test-agent',
+ llm=LLM(
+ model='test-model',
+ api_key=SecretStr('test-key'),
+ base_url='https://test.com',
+ timeout=123,
+ litellm_extra_body={'metadata': {'tier': 'pro'}},
+ ),
+ verification=VerificationSettings(
+ critic_enabled=True,
+ critic_mode='all_actions',
+ enable_iterative_refinement=True,
+ critic_threshold=0.7,
+ max_refinement_iterations=4,
+ ),
+ ),
+ conversation_settings=ConversationSettings(
+ max_iterations=100,
+ confirmation_mode=True,
+ security_analyzer='llm',
+ ),
+ )
# Make the POST request to store settings
- response = test_client.post('/api/v1/settings', json=settings_data)
+ response = test_client.post('/api/settings', json=_dump(settings))
# We're not checking the exact response, just that it doesn't error
assert response.status_code == 200
# Test the GET settings endpoint
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
-
- # Test updating with partial settings
+ response_data = response.json()
+ assert 'agent_settings_schema' not in response_data
+ vals = response_data['agent_settings']
+ assert vals['llm']['model'] == 'test-model'
+ assert vals['llm']['timeout'] == 123
+ assert vals['llm']['litellm_extra_body'] == {'metadata': {'tier': 'pro'}}
+ assert vals['verification']['critic_enabled'] is True
+ assert vals['verification']['critic_mode'] == 'all_actions'
+ assert vals['verification']['enable_iterative_refinement'] is True
+ assert vals['verification']['critic_threshold'] == 0.7
+ assert vals['verification']['max_refinement_iterations'] == 4
+ cs = response_data['conversation_settings']
+ assert cs['confirmation_mode'] is True
+ assert cs['security_analyzer'] == 'llm'
+ assert cs['max_iterations'] == 100
+ assert vals['llm']['api_key'] == '**********'
+
+ # Test updating with partial settings — legacy flat fields should preserve existing
partial_settings = {
'language': 'fr',
- 'llm_model': None, # Should preserve existing value
- 'llm_api_key': None, # Should preserve existing value
+ 'llm_model': None,
+ 'llm_api_key': None,
}
- response = test_client.post('/api/v1/settings', json=partial_settings)
+ response = test_client.post('/api/settings', json=partial_settings)
assert response.status_code == 200
+ response = test_client.get('/api/settings')
+ assert response.status_code == 200
+ assert response.json()['agent_settings']['llm']['timeout'] == 123
+
# Test the unset-provider-tokens endpoint
- response = test_client.delete('/api/v1/secrets/git-providers')
+ response = test_client.post('/api/unset-provider-tokens')
assert response.status_code == 200
@pytest.mark.asyncio
-async def test_search_api_key_preservation(test_client):
- """Test that search_api_key is preserved when sending empty string"""
- # 1. Set initial settings with a search API key
- initial_settings = {
- 'search_api_key': 'initial-secret-key',
- 'llm_model': 'gpt-4',
- }
- response = test_client.post('/api/v1/settings', json=initial_settings)
+async def test_saving_settings_with_frozen_secrets_store(test_client):
+ """Regression: POSTing settings must not fail with `secrets_store`.
+
+ See https://github.com/OpenHands/OpenHands/issues/13306.
+ """
+ payload = _dump(
+ Settings(
+ language='en',
+ agent_settings=AgentSettings(llm=LLM(model='gpt-4')),
+ )
+ )
+ # Inject an extra key the API should ignore gracefully
+ payload['secrets_store'] = {'provider_tokens': {}}
+ response = test_client.post('/api/settings', json=payload)
+ assert response.status_code == 200
+
+
+async def test_search_api_key_explicit_clear(test_client):
+ """Explicit empty search_api_key payloads should clear the stored secret."""
+ response = test_client.post(
+ '/api/settings',
+ json=_dump(
+ Settings(
+ search_api_key='initial-secret-key',
+ agent_settings=AgentSettings(llm=LLM(model='gpt-4')),
+ )
+ ),
+ )
assert response.status_code == 200
- # Verify key is set
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
assert response.json()['search_api_key_set'] is True
- # 2. Update settings with EMPTY search API key (simulating the frontend bug)
- # and changing another field (llm_model)
- update_settings = {
- 'search_api_key': '', # The frontend sends an empty string here
- 'llm_model': 'claude-3-opus',
- }
- response = test_client.post('/api/v1/settings', json=update_settings)
+ response = test_client.post(
+ '/api/settings',
+ json=_dump(
+ Settings(
+ search_api_key='',
+ agent_settings=AgentSettings(llm=LLM(model='claude-3-opus')),
+ )
+ ),
+ )
assert response.status_code == 200
- # 3. Verify the key was NOT wiped out (The Critical Check)
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
- # If the bug was present, this would be False
- assert response.json()['search_api_key_set'] is True
- # Verify the other field updated correctly
- assert response.json()['llm_model'] == 'claude-3-opus'
+ assert response.json()['search_api_key_set'] is False
+ assert response.json()['agent_settings']['llm']['model'] == 'claude-3-opus'
@pytest.mark.asyncio
async def test_disabled_skills_persistence(test_client):
"""Test that disabled_skills can be saved and retrieved via the settings API."""
- # 1. Save settings with disabled_skills
- settings_data = {
- 'llm_model': 'test-model',
- 'llm_api_key': 'test-key',
- 'disabled_skills': ['skill_a', 'skill_b'],
- }
- response = test_client.post('/api/v1/settings', json=settings_data)
+ response = test_client.post(
+ '/api/settings',
+ json=_dump(
+ Settings(
+ disabled_skills=['skill_a', 'skill_b'],
+ agent_settings=AgentSettings(llm=LLM(model='test-model')),
+ )
+ ),
+ )
assert response.status_code == 200
- # 2. Retrieve and verify
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
data = response.json()
assert data['disabled_skills'] == ['skill_a', 'skill_b']
- # 3. Update with a different list
- update_settings = {
- 'disabled_skills': ['skill_c'],
- }
- response = test_client.post('/api/v1/settings', json=update_settings)
+ response = test_client.post(
+ '/api/settings',
+ json=_dump(Settings(disabled_skills=['skill_c'])),
+ )
assert response.status_code == 200
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
data = response.json()
assert data['disabled_skills'] == ['skill_c']
- # 4. Clear the list
- update_settings = {
- 'disabled_skills': [],
- }
- response = test_client.post('/api/v1/settings', json=update_settings)
+ response = test_client.post(
+ '/api/settings',
+ json=_dump(Settings(disabled_skills=[])),
+ )
assert response.status_code == 200
- response = test_client.get('/api/v1/settings')
+ response = test_client.get('/api/settings')
assert response.status_code == 200
data = response.json()
assert data['disabled_skills'] == []
diff --git a/tests/unit/app_server/test_skill_loader.py b/tests/unit/app_server/test_skill_loader.py
index 3ce567ed33..a4673c5280 100644
--- a/tests/unit/app_server/test_skill_loader.py
+++ b/tests/unit/app_server/test_skill_loader.py
@@ -32,7 +32,7 @@ from openhands.app_server.sandbox.sandbox_models import (
from openhands.app_server.user.user_context import UserContext
from openhands.integrations.provider import ProviderType
from openhands.integrations.service_types import AuthenticationError
-from openhands.sdk.context.skills import KeywordTrigger, Skill, TaskTrigger
+from openhands.sdk.skills import KeywordTrigger, Skill, TaskTrigger
# ===== Test Fixtures =====
diff --git a/tests/unit/core/config/test_mcp_config.py b/tests/unit/core/config/test_mcp_config.py
index 8ac78e1a7c..b519780b51 100644
--- a/tests/unit/core/config/test_mcp_config.py
+++ b/tests/unit/core/config/test_mcp_config.py
@@ -8,9 +8,10 @@ from openhands.controller.agent import Agent
from openhands.core.config import OpenHandsConfig, load_from_env
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSHTTPServerConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
+ mcp_config_from_toml,
+ merge_mcp_configs,
)
from openhands.llm.llm_registry import LLMRegistry
from openhands.server.services.conversation_stats import ConversationStats
@@ -19,108 +20,54 @@ from openhands.server.session.session import Session
from openhands.storage.memory import InMemoryFileStore
-def test_valid_sse_config():
- """Test a valid SSE configuration."""
+def test_valid_remote_config():
+ """Test a valid remote server configuration."""
config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='http://server1:8080'),
- MCPSSEServerConfig(url='http://server2:8080'),
- ]
+ mcpServers={
+ 'server1': RemoteMCPServer(url='http://server1:8080', transport='sse'),
+ 'server2': RemoteMCPServer(url='http://server2:8080', transport='http'),
+ }
)
- config.validate_servers() # Should not raise any exception
+ assert len(config.mcpServers) == 2
-def test_empty_sse_config():
- """Test SSE configuration with empty servers list."""
- config = MCPConfig(sse_servers=[])
- config.validate_servers()
+def test_empty_config():
+ """Test configuration with no servers."""
+ config = MCPConfig(mcpServers={})
+ assert len(config.mcpServers) == 0
-def test_invalid_sse_url():
- """Test SSE configuration with invalid URL format."""
- with pytest.raises(ValidationError) as exc_info:
- MCPSSEServerConfig(url='not_a_url')
- assert 'URL must include a scheme' in str(exc_info.value)
-
-
-def test_duplicate_sse_urls():
- """Test SSE configuration with duplicate server URLs."""
- config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='http://server1:8080'),
- MCPSSEServerConfig(url='http://server1:8080'),
- ]
+def test_remote_server_config_with_auth():
+ """Test RemoteMCPServer with auth token."""
+ config = RemoteMCPServer(
+ url='http://server1:8080', transport='sse', auth='test-api-key'
)
- with pytest.raises(ValueError) as exc_info:
- config.validate_servers()
- assert 'Duplicate MCP server URLs are not allowed' in str(exc_info.value)
-
-
-def test_from_toml_section_valid():
- """Test creating config from valid TOML section."""
- data = {
- 'sse_servers': ['http://server1:8080'],
- }
- result = MCPConfig.from_toml_section(data)
- assert 'mcp' in result
- assert len(result['mcp'].sse_servers) == 1
- assert result['mcp'].sse_servers[0].url == 'http://server1:8080'
-
-
-def test_from_toml_section_invalid_sse():
- """Test creating config from TOML section with invalid SSE URL."""
- data = {
- 'sse_servers': ['not_a_url'],
- }
- with pytest.raises(ValueError) as exc_info:
- MCPConfig.from_toml_section(data)
- assert 'URL must include a scheme' in str(exc_info.value)
-
-
-def test_complex_urls():
- """Test SSE configuration with complex URLs."""
- config = MCPConfig(
- sse_servers=[
- MCPSSEServerConfig(url='https://user:pass@server1:8080/path?query=1'),
- MCPSSEServerConfig(url='wss://server2:8443/ws'),
- MCPSSEServerConfig(url='http://subdomain.example.com:9090'),
- ]
- )
- config.validate_servers() # Should not raise any exception
-
-
-def test_mcp_sse_server_config_with_api_key():
- """Test MCPSSEServerConfig with API key."""
- config = MCPSSEServerConfig(url='http://server1:8080', api_key='test-api-key')
assert config.url == 'http://server1:8080'
- assert config.api_key == 'test-api-key'
+ assert config.auth == 'test-api-key'
-def test_mcp_sse_server_config_without_api_key():
- """Test MCPSSEServerConfig without API key."""
- config = MCPSSEServerConfig(url='http://server1:8080')
+def test_remote_server_config_without_auth():
+ """Test RemoteMCPServer without auth token."""
+ config = RemoteMCPServer(url='http://server1:8080', transport='sse')
assert config.url == 'http://server1:8080'
- assert config.api_key is None
+ assert config.auth is None
def test_mcp_stdio_server_config_basic():
- """Test basic MCPStdioServerConfig."""
- config = MCPStdioServerConfig(name='test-server', command='python')
- assert config.name == 'test-server'
+ """Test basic StdioMCPServer."""
+ config = StdioMCPServer(command='python')
assert config.command == 'python'
assert config.args == []
assert config.env == {}
def test_mcp_stdio_server_config_with_args_and_env():
- """Test MCPStdioServerConfig with args and env."""
- config = MCPStdioServerConfig(
- name='test-server',
+ """Test StdioMCPServer with args and env."""
+ config = StdioMCPServer(
command='python',
args=['-m', 'server'],
env={'DEBUG': 'true', 'PORT': '8080'},
)
- assert config.name == 'test-server'
assert config.command == 'python'
assert config.args == ['-m', 'server']
assert config.env == {'DEBUG': 'true', 'PORT': '8080'}
@@ -128,24 +75,41 @@ def test_mcp_stdio_server_config_with_args_and_env():
def test_mcp_config_with_stdio_servers():
"""Test MCPConfig with stdio servers."""
- stdio_server = MCPStdioServerConfig(
- name='test-server',
- command='python',
- args=['-m', 'server'],
- env={'DEBUG': 'true'},
+ config = MCPConfig(
+ mcpServers={
+ 'test-server': StdioMCPServer(
+ command='python',
+ args=['-m', 'server'],
+ env={'DEBUG': 'true'},
+ )
+ }
)
- config = MCPConfig(stdio_servers=[stdio_server])
- assert len(config.stdio_servers) == 1
- assert config.stdio_servers[0].name == 'test-server'
- assert config.stdio_servers[0].command == 'python'
- assert config.stdio_servers[0].args == ['-m', 'server']
- assert config.stdio_servers[0].env == {'DEBUG': 'true'}
+ assert len(config.mcpServers) == 1
+ server = config.mcpServers['test-server']
+ assert isinstance(server, StdioMCPServer)
+ assert server.command == 'python'
+ assert server.args == ['-m', 'server']
+ assert server.env == {'DEBUG': 'true'}
+
+
+def test_from_toml_section_valid():
+ """Test creating config from valid TOML section."""
+ data = {
+ 'sse_servers': [{'url': 'http://server1:8080'}],
+ }
+ result = mcp_config_from_toml(data)
+ assert 'mcp' in result
+ mcp = result['mcp']
+ assert len(mcp.mcpServers) == 1
+ server = list(mcp.mcpServers.values())[0]
+ assert isinstance(server, RemoteMCPServer)
+ assert server.url == 'http://server1:8080'
def test_from_toml_section_with_stdio_servers():
"""Test creating config from TOML section with stdio servers."""
data = {
- 'sse_servers': ['http://server1:8080'],
+ 'sse_servers': [{'url': 'http://server1:8080'}],
'stdio_servers': [
{
'name': 'test-server',
@@ -155,276 +119,159 @@ def test_from_toml_section_with_stdio_servers():
}
],
}
- result = MCPConfig.from_toml_section(data)
+ result = mcp_config_from_toml(data)
assert 'mcp' in result
- assert len(result['mcp'].sse_servers) == 1
- assert result['mcp'].sse_servers[0].url == 'http://server1:8080'
- assert len(result['mcp'].stdio_servers) == 1
- assert result['mcp'].stdio_servers[0].name == 'test-server'
- assert result['mcp'].stdio_servers[0].command == 'python'
- assert result['mcp'].stdio_servers[0].args == ['-m', 'server']
- assert result['mcp'].stdio_servers[0].env == {'DEBUG': 'true'}
+ mcp = result['mcp']
+ assert len(mcp.mcpServers) == 2
+ assert 'test-server' in mcp.mcpServers
+ stdio = mcp.mcpServers['test-server']
+ assert isinstance(stdio, StdioMCPServer)
+ assert stdio.command == 'python'
+ assert stdio.args == ['-m', 'server']
+ assert stdio.env == {'DEBUG': 'true'}
def test_mcp_config_with_both_server_types():
- """Test MCPConfig with both SSE and stdio servers."""
- sse_server = MCPSSEServerConfig(url='http://server1:8080', api_key='test-api-key')
- stdio_server = MCPStdioServerConfig(
- name='test-server',
- command='python',
- args=['-m', 'server'],
- env={'DEBUG': 'true'},
+ """Test MCPConfig with both remote and stdio servers."""
+ config = MCPConfig(
+ mcpServers={
+ 'remote': RemoteMCPServer(
+ url='http://server1:8080', transport='sse', auth='test-api-key'
+ ),
+ 'local': StdioMCPServer(
+ command='python',
+ args=['-m', 'server'],
+ env={'DEBUG': 'true'},
+ ),
+ }
)
- config = MCPConfig(sse_servers=[sse_server], stdio_servers=[stdio_server])
- assert len(config.sse_servers) == 1
- assert config.sse_servers[0].url == 'http://server1:8080'
- assert config.sse_servers[0].api_key == 'test-api-key'
- assert len(config.stdio_servers) == 1
- assert config.stdio_servers[0].name == 'test-server'
- assert config.stdio_servers[0].command == 'python'
+ assert len(config.mcpServers) == 2
+ remote = config.mcpServers['remote']
+ assert isinstance(remote, RemoteMCPServer)
+ assert remote.url == 'http://server1:8080'
+ assert remote.auth == 'test-api-key'
+ local = config.mcpServers['local']
+ assert isinstance(local, StdioMCPServer)
+ assert local.command == 'python'
def test_mcp_config_model_validation_error():
"""Test MCPConfig validation error with invalid data."""
with pytest.raises(ValidationError):
# Missing required 'url' field
- MCPSSEServerConfig()
+ RemoteMCPServer()
with pytest.raises(ValidationError):
- # Missing required 'name' and 'command' fields
- MCPStdioServerConfig()
-
+ # Missing required 'command' field
+ StdioMCPServer()
-def test_mcp_config_extra_fields_forbidden():
- """Test that extra fields are forbidden in MCPConfig."""
- with pytest.raises(ValidationError):
- MCPConfig(extra_field='value')
- # Note: The nested models don't have 'extra': 'forbid' set, so they allow extra fields
- # We're only testing the main MCPConfig class here
+def test_merge_mcp_configs():
+ """Test merging two MCPConfig instances."""
+ c1 = MCPConfig(
+ mcpServers={
+ 'a': RemoteMCPServer(url='http://a.com', transport='sse'),
+ }
+ )
+ c2 = MCPConfig(
+ mcpServers={
+ 'b': StdioMCPServer(command='echo'),
+ }
+ )
+ merged = merge_mcp_configs(c1, c2)
+ assert len(merged.mcpServers) == 2
+ assert 'a' in merged.mcpServers
+ assert 'b' in merged.mcpServers
+
+
+def test_merge_mcp_configs_override():
+ """Test that merge_mcp_configs uses the 'other' value for duplicate keys."""
+ c1 = MCPConfig(
+ mcpServers={
+ 'same': RemoteMCPServer(url='http://old.com', transport='sse'),
+ }
+ )
+ c2 = MCPConfig(
+ mcpServers={
+ 'same': RemoteMCPServer(url='http://new.com', transport='http'),
+ }
+ )
+ merged = merge_mcp_configs(c1, c2)
+ assert len(merged.mcpServers) == 1
+ assert merged.mcpServers['same'].url == 'http://new.com'
-def test_stdio_server_equality_with_different_env_order():
- """Test that MCPStdioServerConfig equality works with env in different order but respects arg order."""
- # Test 1: Same args, different env order
- server1 = MCPStdioServerConfig(
- name='test-server',
+def test_stdio_server_equality():
+ """Test StdioMCPServer equality."""
+ server1 = StdioMCPServer(
command='python',
args=['--verbose', '--debug', '--port=8080'],
env={'DEBUG': 'true', 'PORT': '8080'},
)
- server2 = MCPStdioServerConfig(
- name='test-server',
+ server2 = StdioMCPServer(
command='python',
- args=['--verbose', '--debug', '--port=8080'], # Same order
- env={'PORT': '8080', 'DEBUG': 'true'}, # Different order
+ args=['--verbose', '--debug', '--port=8080'],
+ env={'PORT': '8080', 'DEBUG': 'true'},
)
- # Should be equal because env is compared as a set
assert server1 == server2
- # Test 2: Different args order
- server3 = MCPStdioServerConfig(
- name='test-server',
+ server3 = StdioMCPServer(
command='python',
- args=['--debug', '--port=8080', '--verbose'], # Different order
+ args=['--debug', '--port=8080', '--verbose'],
env={'DEBUG': 'true', 'PORT': '8080'},
)
- # Should NOT be equal because args order matters
assert server1 != server3
- # Test 3: Different arg value
- server4 = MCPStdioServerConfig(
- name='test-server',
- command='python',
- args=['--verbose', '--debug', '--port=9090'], # Different port
- env={'DEBUG': 'true', 'PORT': '8080'},
- )
-
- # Should not be equal
- assert server1 != server4
-
- # Test 4: Different env value
- server5 = MCPStdioServerConfig(
- name='test-server',
- command='python',
- args=['--verbose', '--debug', '--port=8080'],
- env={'DEBUG': 'true', 'PORT': '9090'}, # Different port
- )
-
- # Should not be equal
- assert server1 != server5
-
-def test_mcp_stdio_server_args_parsing_basic():
- """Test MCPStdioServerConfig args parsing with basic shell-like format."""
- # Test basic space-separated parsing
- config = MCPStdioServerConfig(
- name='test-server', command='python', args='arg1 arg2 arg3'
- )
- assert config.args == ['arg1', 'arg2', 'arg3']
-
- # Test single argument
- config = MCPStdioServerConfig(
- name='test-server', command='python', args='single-arg'
- )
- assert config.args == ['single-arg']
-
-
-def test_mcp_stdio_server_args_parsing_invalid_quotes():
- """Test MCPStdioServerConfig args parsing with invalid quotes."""
- # Test unmatched quotes
- with pytest.raises(ValidationError) as exc_info:
- MCPStdioServerConfig(
- name='test-server', command='python', args='--config "unmatched quote'
- )
- assert 'Invalid argument format' in str(exc_info.value)
-
-
-def test_env_var_mcp_shttp_server_config(monkeypatch):
- """Test creating MCPSHTTPServerConfig from environment variables."""
- # Set environment variables for MCP HTTP server
- monkeypatch.setenv(
- 'MCP_SHTTP_SERVERS',
- '[{"url": "http://env-server:8080", "api_key": "env-api-key"}]',
- )
-
- # Create a config object
- config = OpenHandsConfig()
-
- # Load from environment
- load_from_env(config, os.environ)
-
- # Convert dictionary servers to proper server config objects by creating a new MCPConfig
- # This triggers the model validator which automatically converts dict servers to proper objects
- config.mcp = MCPConfig(
- sse_servers=config.mcp.sse_servers,
- stdio_servers=config.mcp.stdio_servers,
- shttp_servers=config.mcp.shttp_servers,
- )
-
- # Check that the HTTP server was added
- assert len(config.mcp.shttp_servers) == 1
-
- # Access the first server
- server = config.mcp.shttp_servers[0]
-
- # Verify it's a proper server config object
- assert isinstance(server, MCPSHTTPServerConfig)
- assert server.url == 'http://env-server:8080'
- assert server.api_key == 'env-api-key'
-
- # Now let's create a proper MCPConfig with the values from the environment
- mcp_config = MCPConfig(shttp_servers=config.mcp.shttp_servers)
-
- # Verify that the MCPSHTTPServerConfig objects are created correctly
- assert len(mcp_config.shttp_servers) == 1
- assert isinstance(mcp_config.shttp_servers[0], MCPSHTTPServerConfig)
- assert mcp_config.shttp_servers[0].url == 'http://env-server:8080'
- assert mcp_config.shttp_servers[0].api_key == 'env-api-key'
-
-
-def test_env_var_mcp_shttp_server_config_with_toml(monkeypatch, tmp_path):
- """Test creating MCPSHTTPServerConfig from environment variables with TOML config."""
- # Create a TOML file with some MCP configuration
+def test_toml_mcp_config_loads(tmp_path):
+ """Test that TOML [mcp] sections with legacy format load correctly."""
toml_file = tmp_path / 'config.toml'
with open(toml_file, 'w', encoding='utf-8') as f:
f.write("""
[mcp]
-sse_servers = ["http://toml-server:8080"]
+sse_servers = [{ url = "http://toml-server:8080" }]
shttp_servers = [
{ url = "http://toml-http-server:8080", api_key = "toml-api-key" }
]
""")
- # Set environment variables for MCP HTTP server to override TOML
- monkeypatch.setenv(
- 'MCP_SHTTP_SERVERS',
- '[{"url": "http://env-server:8080", "api_key": "env-api-key"}]',
- )
-
- # Create a config object
config = OpenHandsConfig()
- # Load from TOML first
from openhands.core.config import load_from_toml
load_from_toml(config, str(toml_file))
- # Verify TOML values were loaded
- assert len(config.mcp.shttp_servers) == 1
- assert isinstance(config.mcp.shttp_servers[0], MCPSHTTPServerConfig)
- assert config.mcp.shttp_servers[0].url == 'http://toml-http-server:8080'
- assert config.mcp.shttp_servers[0].api_key == 'toml-api-key'
-
- # Now load from environment, which should override TOML
- load_from_env(config, os.environ)
-
- # Check that the environment values override the TOML values
- assert len(config.mcp.shttp_servers) == 1
-
- # The values should now be from the environment
- server = config.mcp.shttp_servers[0]
- assert isinstance(server, MCPSHTTPServerConfig)
- assert server.url == 'http://env-server:8080'
- assert server.api_key == 'env-api-key'
-
-
-def test_env_var_mcp_shttp_servers_with_python_str_representation(monkeypatch):
- """Test creating MCPSHTTPServerConfig from environment variables using Python string representation."""
- # Create a Python list of dictionaries
- mcp_shttp_servers = [
- {'url': 'https://example.com/mcp/mcp', 'api_key': 'test-api-key'}
- ]
-
- # Set environment variable with the string representation of the Python list
- monkeypatch.setenv('MCP_SHTTP_SERVERS', str(mcp_shttp_servers))
-
- # Create a config object
- config = OpenHandsConfig()
-
- # Load from environment
- load_from_env(config, os.environ)
-
- # Check that the HTTP server was added
- assert len(config.mcp.shttp_servers) == 1
-
- # Access the first server
- server = config.mcp.shttp_servers[0]
-
- # Check that it's a dict with the expected keys
- assert isinstance(server, MCPSHTTPServerConfig)
- assert server.url == 'https://example.com/mcp/mcp'
- assert server.api_key == 'test-api-key'
+ # Verify TOML values were loaded as SDK MCPConfig
+ assert len(config.mcp.mcpServers) >= 2
@pytest.mark.asyncio
-async def test_session_preserves_env_mcp_config(monkeypatch):
- """Test that Session preserves MCP configuration from environment variables."""
- # Set environment variables for MCP HTTP server
- monkeypatch.setenv(
- 'MCP_SHTTP_SERVERS',
- '[{"url": "http://env-server:8080", "api_key": "env-api-key"}]',
- )
+async def test_session_preserves_mcp_config(monkeypatch, tmp_path):
+ """Test that Session preserves MCP configuration from TOML."""
+ toml_file = tmp_path / 'config.toml'
+ with open(toml_file, 'w', encoding='utf-8') as f:
+ f.write("""
+[mcp]
+shttp_servers = [
+ { url = "http://test-server:8080", api_key = "test-key" }
+]
+""")
- # Also set MCP_HOST to prevent the default server from being added
monkeypatch.setenv('MCP_HOST', 'dummy')
- # Create a config object and load from environment
config = OpenHandsConfig()
+
+ from openhands.core.config import load_from_toml
+
+ load_from_toml(config, str(toml_file))
load_from_env(config, os.environ)
- # Verify the environment variables were loaded into the config
assert config.mcp_host == 'dummy'
- assert len(config.mcp.shttp_servers) == 1
- # If it's already a proper server config object, just verify it
- assert isinstance(config.mcp.shttp_servers[0], MCPSHTTPServerConfig)
- assert config.mcp.shttp_servers[0].url == 'http://env-server:8080'
- assert config.mcp.shttp_servers[0].api_key == 'env-api-key'
+ assert len(config.mcp.mcpServers) >= 1
- # Create a session with the config
session = Session(
sid='test-sid',
file_store=InMemoryFileStore({}),
@@ -434,23 +281,18 @@ async def test_session_preserves_env_mcp_config(monkeypatch):
conversation_stats=ConversationStats(None, 'test-sid', None),
)
- # Create empty settings
settings = ConversationInitData()
- # Mock the Agent.get_cls method to avoid AgentNotRegisteredError
mock_agent_cls = MagicMock()
mock_agent_instance = MagicMock()
mock_agent_cls.return_value = mock_agent_instance
- # Initialize the agent (this is where the MCP config would be reset)
with (
patch.object(session.agent_session, 'start', AsyncMock()),
patch.object(Agent, 'get_cls', return_value=mock_agent_cls),
):
await session.initialize_agent(settings, None, None)
- # Verify that the MCP configuration was preserved
- assert len(session.config.mcp.shttp_servers) >= 0
+ assert isinstance(session.config.mcp, MCPConfig)
- # Clean up
await session.close()
diff --git a/tests/unit/core/config/test_mcp_settings_merge.py b/tests/unit/core/config/test_mcp_settings_merge.py
index 0b385729d0..79969a4a68 100644
--- a/tests/unit/core/config/test_mcp_settings_merge.py
+++ b/tests/unit/core/config/test_mcp_settings_merge.py
@@ -1,144 +1,184 @@
"""Test MCP settings merging functionality."""
+import os
from unittest.mock import patch
import pytest
from openhands.core.config.mcp_config import (
MCPConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import AgentSettings
from openhands.storage.data_models.settings import Settings
[email protected](autouse=True)
+def allow_short_context_windows():
+ with patch.dict(os.environ, {'ALLOW_SHORT_CONTEXT_WINDOWS': 'true'}, clear=False):
+ yield
+
+
+def _mcp_config(settings: Settings) -> MCPConfig | None:
+ mcp = settings.agent_settings.mcp_config
+ return mcp if mcp and mcp.mcpServers else None
+
+
+_DEFAULT_LLM = LLM(model='test-model')
+
+
+def _settings_with_mcp(mcp_config, llm=None):
+ """Helper: create Settings with mcp_config set via agent_settings."""
+ s = Settings(agent_settings=AgentSettings(llm=llm or _DEFAULT_LLM))
+ s.agent_settings.mcp_config = mcp_config
+ return s
+
+
@pytest.mark.asyncio
async def test_mcp_settings_merge_config_only():
"""Test merging when only config.toml has MCP settings."""
- # Mock config.toml with MCP settings
- mock_config_settings = Settings(
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://config-server.com')]
+ mock_config_settings = _settings_with_mcp(
+ MCPConfig(
+ mcpServers={
+ 'config': RemoteMCPServer(
+ url='http://config-server.com', transport='sse'
+ )
+ }
)
)
- # Frontend settings without MCP config
- frontend_settings = Settings(llm_model='gpt-4')
+ frontend_settings = Settings(agent_settings=AgentSettings(llm=LLM(model='gpt-4')))
- with patch.object(Settings, 'from_config', return_value=mock_config_settings):
+ with patch(
+ 'openhands.storage.data_models.settings.Settings.from_config',
+ return_value=mock_config_settings,
+ ):
merged_settings = frontend_settings.merge_with_config_settings()
- # Should use config.toml MCP settings
- assert merged_settings.mcp_config is not None
- assert len(merged_settings.mcp_config.sse_servers) == 1
- assert merged_settings.mcp_config.sse_servers[0].url == 'http://config-server.com'
- assert merged_settings.llm_model == 'gpt-4'
+ merged_mcp_config = _mcp_config(merged_settings)
+ assert merged_mcp_config is not None
+ assert len(merged_mcp_config.mcpServers) == 1
+ assert 'config' in merged_mcp_config.mcpServers
+ assert merged_settings.agent_settings.llm.model == 'gpt-4'
@pytest.mark.asyncio
async def test_mcp_settings_merge_frontend_only():
"""Test merging when only frontend has MCP settings."""
- # Mock config.toml without MCP settings
- mock_config_settings = Settings(llm_model='claude-3')
-
- # Frontend settings with MCP config
- frontend_settings = Settings(
- llm_model='gpt-4',
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://frontend-server.com')]
+ mock_config_settings = Settings(
+ agent_settings=AgentSettings(llm=LLM(model='claude-3'))
+ )
+
+ frontend_settings = _settings_with_mcp(
+ MCPConfig(
+ mcpServers={
+ 'frontend': RemoteMCPServer(
+ url='http://frontend-server.com', transport='sse'
+ )
+ }
),
+ llm=LLM(model='gpt-4'),
)
- with patch.object(Settings, 'from_config', return_value=mock_config_settings):
+ with patch(
+ 'openhands.storage.data_models.settings.Settings.from_config',
+ return_value=mock_config_settings,
+ ):
merged_settings = frontend_settings.merge_with_config_settings()
- # Should keep frontend MCP settings
- assert merged_settings.mcp_config is not None
- assert len(merged_settings.mcp_config.sse_servers) == 1
- assert merged_settings.mcp_config.sse_servers[0].url == 'http://frontend-server.com'
- assert merged_settings.llm_model == 'gpt-4'
+ merged_mcp_config = _mcp_config(merged_settings)
+ assert merged_mcp_config is not None
+ assert len(merged_mcp_config.mcpServers) == 1
+ assert 'frontend' in merged_mcp_config.mcpServers
+ assert merged_settings.agent_settings.llm.model == 'gpt-4'
@pytest.mark.asyncio
async def test_mcp_settings_merge_both_present():
"""Test merging when both config.toml and frontend have MCP settings."""
- # Mock config.toml with MCP settings
- mock_config_settings = Settings(
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://config-server.com')],
- stdio_servers=[
- MCPStdioServerConfig(
- name='config-stdio', command='config-cmd', args=['arg1']
- )
- ],
+ mock_config_settings = _settings_with_mcp(
+ MCPConfig(
+ mcpServers={
+ 'config-sse': RemoteMCPServer(
+ url='http://config-server.com', transport='sse'
+ ),
+ 'config-stdio': StdioMCPServer(command='config-cmd', args=['arg1']),
+ }
)
)
- # Frontend settings with different MCP config
- frontend_settings = Settings(
- llm_model='gpt-4',
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://frontend-server.com')],
- stdio_servers=[
- MCPStdioServerConfig(
- name='frontend-stdio', command='frontend-cmd', args=['arg2']
- )
- ],
+ frontend_settings = _settings_with_mcp(
+ MCPConfig(
+ mcpServers={
+ 'frontend-sse': RemoteMCPServer(
+ url='http://frontend-server.com', transport='sse'
+ ),
+ 'frontend-stdio': StdioMCPServer(command='frontend-cmd', args=['arg2']),
+ }
),
+ llm=LLM(model='gpt-4'),
)
- with patch.object(Settings, 'from_config', return_value=mock_config_settings):
+ with patch(
+ 'openhands.storage.data_models.settings.Settings.from_config',
+ return_value=mock_config_settings,
+ ):
merged_settings = frontend_settings.merge_with_config_settings()
- # Should merge both with config.toml taking priority (appearing first)
- assert merged_settings.mcp_config is not None
- assert len(merged_settings.mcp_config.sse_servers) == 2
- assert merged_settings.mcp_config.sse_servers[0].url == 'http://config-server.com'
- assert merged_settings.mcp_config.sse_servers[1].url == 'http://frontend-server.com'
-
- assert len(merged_settings.mcp_config.stdio_servers) == 2
- assert merged_settings.mcp_config.stdio_servers[0].name == 'config-stdio'
- assert merged_settings.mcp_config.stdio_servers[1].name == 'frontend-stdio'
-
- assert merged_settings.llm_model == 'gpt-4'
+ merged_mcp_config = _mcp_config(merged_settings)
+ assert merged_mcp_config is not None
+ assert len(merged_mcp_config.mcpServers) == 4
+ assert 'config-sse' in merged_mcp_config.mcpServers
+ assert 'frontend-sse' in merged_mcp_config.mcpServers
+ assert 'config-stdio' in merged_mcp_config.mcpServers
+ assert 'frontend-stdio' in merged_mcp_config.mcpServers
+ assert merged_settings.agent_settings.llm.model == 'gpt-4'
@pytest.mark.asyncio
async def test_mcp_settings_merge_no_config():
"""Test merging when config.toml has no MCP settings."""
- # Mock config.toml without MCP settings
mock_config_settings = None
- # Frontend settings with MCP config
- frontend_settings = Settings(
- llm_model='gpt-4',
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://frontend-server.com')]
+ frontend_settings = _settings_with_mcp(
+ MCPConfig(
+ mcpServers={
+ 'frontend': RemoteMCPServer(
+ url='http://frontend-server.com', transport='sse'
+ )
+ }
),
+ llm=LLM(model='gpt-4'),
)
- with patch.object(Settings, 'from_config', return_value=mock_config_settings):
+ with patch(
+ 'openhands.storage.data_models.settings.Settings.from_config',
+ return_value=mock_config_settings,
+ ):
merged_settings = frontend_settings.merge_with_config_settings()
- # Should keep frontend settings unchanged
- assert merged_settings.mcp_config is not None
- assert len(merged_settings.mcp_config.sse_servers) == 1
- assert merged_settings.mcp_config.sse_servers[0].url == 'http://frontend-server.com'
- assert merged_settings.llm_model == 'gpt-4'
+ merged_mcp_config = _mcp_config(merged_settings)
+ assert merged_mcp_config is not None
+ assert len(merged_mcp_config.mcpServers) == 1
+ assert merged_settings.agent_settings.llm.model == 'gpt-4'
@pytest.mark.asyncio
async def test_mcp_settings_merge_neither_present():
"""Test merging when neither config.toml nor frontend have MCP settings."""
- # Mock config.toml without MCP settings
- mock_config_settings = Settings(llm_model='claude-3')
+ mock_config_settings = Settings(
+ agent_settings=AgentSettings(llm=LLM(model='claude-3'))
+ )
- # Frontend settings without MCP config
- frontend_settings = Settings(llm_model='gpt-4')
+ frontend_settings = Settings(agent_settings=AgentSettings(llm=LLM(model='gpt-4')))
- with patch.object(Settings, 'from_config', return_value=mock_config_settings):
+ with patch(
+ 'openhands.storage.data_models.settings.Settings.from_config',
+ return_value=mock_config_settings,
+ ):
merged_settings = frontend_settings.merge_with_config_settings()
- # Should keep frontend settings unchanged
- assert merged_settings.mcp_config is None
- assert merged_settings.llm_model == 'gpt-4'
+ assert _mcp_config(merged_settings) is None
+ assert merged_settings.agent_settings.llm.model == 'gpt-4'
diff --git a/tests/unit/core/config/test_shttp_timeout_config.py b/tests/unit/core/config/test_shttp_timeout_config.py
index 6de919419f..75f5964d32 100644
--- a/tests/unit/core/config/test_shttp_timeout_config.py
+++ b/tests/unit/core/config/test_shttp_timeout_config.py
@@ -1,122 +1,63 @@
-"""Test MCP SHTTP server timeout configuration."""
+"""Test MCP remote server timeout configuration."""
-import pytest
-from pydantic import ValidationError
+from openhands.core.config.mcp_config import RemoteMCPServer
-from openhands.core.config.mcp_config import MCPSHTTPServerConfig
+class TestRemoteMCPServer:
+ """Test remote server configuration with timeout field."""
-class TestMCPSHTTPServerConfig:
- """Test SHTTP server configuration with timeout field."""
-
- def test_shttp_config_with_timeout(self):
- """Test SHTTP config accepts timeout parameter."""
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=90)
+ def test_remote_config_with_timeout(self):
+ """Test remote config accepts timeout parameter."""
+ config = RemoteMCPServer(
+ url='https://api.example.com/mcp', transport='http', timeout=90
+ )
assert config.timeout == 90
assert config.url == 'https://api.example.com/mcp'
- assert config.api_key is None
- def test_shttp_config_with_api_key_and_timeout(self):
- """Test SHTTP config with both API key and timeout."""
- config = MCPSHTTPServerConfig(
- url='https://api.example.com/mcp', api_key='test-key-123', timeout=120
+ def test_remote_config_with_auth_and_timeout(self):
+ """Test remote config with both auth and timeout."""
+ config = RemoteMCPServer(
+ url='https://api.example.com/mcp',
+ transport='http',
+ auth='test-key-123',
+ timeout=120,
)
assert config.timeout == 120
- assert config.api_key == 'test-key-123'
+ assert config.auth == 'test-key-123'
- def test_shttp_config_default_timeout(self):
- """Test SHTTP config uses default timeout when not specified."""
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp')
- assert config.timeout == 60 # Default value
-
- def test_shttp_config_none_timeout(self):
- """Test SHTTP config accepts None timeout."""
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=None)
+ def test_remote_config_default_timeout(self):
+ """Test remote config default timeout (None)."""
+ config = RemoteMCPServer(url='https://api.example.com/mcp', transport='http')
assert config.timeout is None
- def test_timeout_validation_positive_values(self):
- """Test timeout validation accepts positive values."""
- # Test various valid timeout values
+ def test_remote_config_positive_timeout(self):
+ """Test timeout accepts positive values."""
valid_timeouts = [1, 5, 30, 60, 120, 300, 600, 1800, 3600]
for timeout in valid_timeouts:
- config = MCPSHTTPServerConfig(
- url='https://api.example.com/mcp', timeout=timeout
+ config = RemoteMCPServer(
+ url='https://api.example.com/mcp', transport='http', timeout=timeout
)
assert config.timeout == timeout
- def test_timeout_validation_zero_raises_error(self):
- """Test timeout validation rejects zero timeout."""
- with pytest.raises(ValidationError) as exc_info:
- MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=0)
- assert 'Timeout must be positive' in str(exc_info.value)
-
- def test_timeout_validation_negative_raises_error(self):
- """Test timeout validation rejects negative timeout."""
- with pytest.raises(ValidationError) as exc_info:
- MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=-10)
- assert 'Timeout must be positive' in str(exc_info.value)
-
- def test_timeout_validation_max_limit(self):
- """Test timeout validation enforces maximum limit."""
- # Test exactly at the limit
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=3600)
- assert config.timeout == 3600
-
- # Test exceeding the limit
- with pytest.raises(ValidationError) as exc_info:
- MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=3601)
- assert 'Timeout cannot exceed 3600 seconds' in str(exc_info.value)
-
- def test_timeout_validation_way_over_limit(self):
- """Test timeout validation rejects very large values."""
- with pytest.raises(ValidationError) as exc_info:
- MCPSHTTPServerConfig(
- url='https://api.example.com/mcp',
- timeout=86400, # 24 hours
- )
- assert 'Timeout cannot exceed 3600 seconds' in str(exc_info.value)
-
- def test_url_validation_still_works(self):
- """Test that existing URL validation still works with timeout field."""
- # Valid URL should work
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=30)
- assert config.url == 'https://api.example.com/mcp'
-
- # Invalid URL should fail
- with pytest.raises(ValidationError):
- MCPSHTTPServerConfig(url='not-a-url', timeout=30)
-
- def test_backward_compatibility_no_timeout(self):
- """Test backward compatibility - config works without timeout field."""
- # Should work exactly like before the timeout field was added
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp')
- assert config.url == 'https://api.example.com/mcp'
- assert config.api_key is None
- assert config.timeout == 60 # Default
-
def test_model_dump_includes_timeout(self):
"""Test that model serialization includes timeout field."""
- config = MCPSHTTPServerConfig(
- url='https://api.example.com/mcp', api_key='test-key', timeout=90
+ config = RemoteMCPServer(
+ url='https://api.example.com/mcp',
+ transport='http',
+ auth='test-key',
+ timeout=90,
)
data = config.model_dump()
- expected = {
- 'url': 'https://api.example.com/mcp',
- 'api_key': 'test-key',
- 'timeout': 90,
- }
- assert data == expected
+ assert data['url'] == 'https://api.example.com/mcp'
+ assert data['auth'] == 'test-key'
+ assert data['timeout'] == 90
- def test_model_dump_with_none_timeout(self):
- """Test model serialization with None timeout."""
- config = MCPSHTTPServerConfig(url='https://api.example.com/mcp', timeout=None)
+ def test_transport_types(self):
+ """Test that transport field accepts sse and http."""
+ sse = RemoteMCPServer(url='https://api.example.com/sse', transport='sse')
+ assert sse.transport == 'sse'
- data = config.model_dump()
- expected = {
- 'url': 'https://api.example.com/mcp',
- 'api_key': None,
- 'timeout': None,
- }
- assert data == expected
+ http = RemoteMCPServer(url='https://api.example.com/mcp', transport='http')
+ assert http.transport == 'http'
diff --git a/tests/unit/mcp/test_cve_2025_66416.py b/tests/unit/mcp/test_cve_2025_66416.py
index 2b503ccfa2..6c404616c9 100644
--- a/tests/unit/mcp/test_cve_2025_66416.py
+++ b/tests/unit/mcp/test_cve_2025_66416.py
@@ -211,11 +211,9 @@ class TestSecurityIntegration:
def test_openhands_mcp_config_types(self):
"""Test OpenHands MCP config types are available."""
from openhands.core.config.mcp_config import (
- MCPSHTTPServerConfig,
- MCPSSEServerConfig,
- MCPStdioServerConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
)
- assert MCPSSEServerConfig is not None
- assert MCPSHTTPServerConfig is not None
- assert MCPStdioServerConfig is not None
+ assert RemoteMCPServer is not None
+ assert StdioMCPServer is not None
diff --git a/tests/unit/mcp/test_mcp_create_clients_timeout.py b/tests/unit/mcp/test_mcp_create_clients_timeout.py
index f25dfc9fa5..6577e4d077 100644
--- a/tests/unit/mcp/test_mcp_create_clients_timeout.py
+++ b/tests/unit/mcp/test_mcp_create_clients_timeout.py
@@ -2,7 +2,7 @@ import asyncio
import pytest
-from openhands.core.config.mcp_config import MCPSSEServerConfig
+from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
from openhands.mcp.client import MCPClient
from openhands.mcp.utils import create_mcp_clients
@@ -10,70 +10,62 @@ from openhands.mcp.utils import create_mcp_clients
@pytest.mark.asyncio
async def test_create_mcp_clients_timeout_with_invalid_url():
"""Test that create_mcp_clients properly times out when given an invalid URL."""
- # Use a non-existent domain that should cause a connection timeout
- server = MCPSSEServerConfig(
- url='http://non-existent-domain-that-will-timeout.invalid'
+ mcp_config = MCPConfig(
+ mcpServers={
+ 'invalid': RemoteMCPServer(
+ url='http://non-existent-domain-that-will-timeout.invalid',
+ transport='sse',
+ )
+ }
)
- # Temporarily modify the default timeout for the MCPClient.connect_http method
- original_connect_connect_http = MCPClient.connect_http
+ original_connect_http = MCPClient.connect_http
- # Create a wrapper that calls the original method but with a shorter timeout
- async def connect_http_with_short_timeout(self, server_url, timeout=30.0):
- return await original_connect_connect_http(self, server_url, timeout=0.5)
+ async def connect_http_with_short_timeout(self, server, **kwargs):
+ return await original_connect_http(self, server, timeout=0.5)
try:
- # Replace the method with our wrapper
MCPClient.connect_http = connect_http_with_short_timeout
- # Call create_mcp_clients with the invalid URL
start_time = asyncio.get_event_loop().time()
- clients = await create_mcp_clients([server], [])
+ clients = await create_mcp_clients(mcp_config)
end_time = asyncio.get_event_loop().time()
- # Verify that no clients were successfully connected
assert len(clients) == 0
-
- # Verify that the operation completed in a reasonable time (less than 5 seconds)
- # This ensures the timeout is working properly
assert end_time - start_time < 5.0, (
'Operation took too long, timeout may not be working'
)
finally:
- # Restore the original method
- MCPClient.connect_http = original_connect_connect_http
+ MCPClient.connect_http = original_connect_http
@pytest.mark.asyncio
async def test_create_mcp_clients_with_unreachable_host():
"""Test that create_mcp_clients handles unreachable hosts properly."""
- # Use a URL with a valid format but pointing to a non-routable IP address
- # This IP is in the TEST-NET-1 range (192.0.2.0/24) reserved for documentation and examples
- unreachable_url = 'http://192.0.2.1:8080'
+ mcp_config = MCPConfig(
+ mcpServers={
+ 'unreachable': RemoteMCPServer(
+ url='http://192.0.2.1:8080',
+ transport='sse',
+ )
+ }
+ )
- # Temporarily modify the default timeout for the MCPClient.connect_http method
original_connect_http = MCPClient.connect_http
- # Create a wrapper that calls the original method but with a shorter timeout
- async def connect_http_with_short_timeout(self, server_url, timeout=30.0):
- return await original_connect_http(self, server_url, timeout=1.0)
+ async def connect_http_with_short_timeout(self, server, **kwargs):
+ return await original_connect_http(self, server, timeout=1.0)
try:
- # Replace the method with our wrapper
MCPClient.connect_http = connect_http_with_short_timeout
- # Call create_mcp_clients with the unreachable URL
start_time = asyncio.get_event_loop().time()
- clients = await create_mcp_clients([unreachable_url], [])
+ clients = await create_mcp_clients(mcp_config)
end_time = asyncio.get_event_loop().time()
- # Verify that no clients were successfully connected
assert len(clients) == 0
-
- # Verify that the operation completed in a reasonable time (less than 5 seconds)
assert end_time - start_time < 5.0, (
'Operation took too long, timeout may not be working'
)
finally:
- # Restore the original method
MCPClient.connect_http = original_connect_http
diff --git a/tests/unit/mcp/test_mcp_integration.py b/tests/unit/mcp/test_mcp_integration.py
index b52f9043f6..4c2fd439fa 100644
--- a/tests/unit/mcp/test_mcp_integration.py
+++ b/tests/unit/mcp/test_mcp_integration.py
@@ -4,34 +4,49 @@ from unittest.mock import AsyncMock, patch
import pytest
-from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import AgentSettings
from openhands.server.user_auth.default_user_auth import DefaultUserAuth
from openhands.storage.data_models.settings import Settings
from openhands.storage.settings.file_settings_store import FileSettingsStore
+def _sdk_mcp_config(settings: Settings) -> MCPConfig | None:
+ return settings.agent_settings.mcp_config
+
+
@pytest.mark.asyncio
async def test_user_auth_mcp_merging_integration():
"""Test that MCP merging works in the user auth flow."""
- # Mock config.toml settings
config_settings = Settings(
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://config-server.com')]
- )
+ agent_settings=AgentSettings(
+ llm=LLM(model='config-model'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'config': RemoteMCPServer(
+ url='http://config-server.com', transport='sse'
+ )
+ }
+ ),
+ ),
)
- # Mock stored frontend settings
stored_settings = Settings(
- llm_model='gpt-4',
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://frontend-server.com')]
+ agent_settings=AgentSettings(
+ llm=LLM(model='anthropic/claude-sonnet-4-5-20250929'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'frontend': RemoteMCPServer(
+ url='http://frontend-server.com', transport='sse'
+ )
+ }
+ ),
),
)
- # Create user auth instance
user_auth = DefaultUserAuth()
- # Mock the settings store to return stored settings
mock_settings_store = AsyncMock(spec=FileSettingsStore)
mock_settings_store.load.return_value = stored_settings
@@ -39,33 +54,46 @@ async def test_user_auth_mcp_merging_integration():
user_auth, 'get_user_settings_store', return_value=mock_settings_store
):
with patch.object(Settings, 'from_config', return_value=config_settings):
- # Get user settings - this should trigger the merging
merged_settings = await user_auth.get_user_settings()
- # Verify merging worked correctly
assert merged_settings is not None
- assert merged_settings.llm_model == 'gpt-4'
- assert merged_settings.mcp_config is not None
- assert len(merged_settings.mcp_config.sse_servers) == 2
-
- # Config.toml server should come first (priority)
- assert merged_settings.mcp_config.sse_servers[0].url == 'http://config-server.com'
- assert merged_settings.mcp_config.sse_servers[1].url == 'http://frontend-server.com'
+ merged_mcp = _sdk_mcp_config(merged_settings)
+ assert (
+ merged_settings.agent_settings.llm.model
+ == 'anthropic/claude-sonnet-4-5-20250929'
+ )
+ assert merged_mcp is not None
+ assert len(merged_mcp.mcpServers) == 2
+ assert 'config' in merged_mcp.mcpServers
+ assert 'frontend' in merged_mcp.mcpServers
@pytest.mark.asyncio
async def test_user_auth_caching_behavior():
"""Test that user auth caches the merged settings correctly."""
config_settings = Settings(
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://config-server.com')]
- )
+ agent_settings=AgentSettings(
+ llm=LLM(model='config-model'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'config': RemoteMCPServer(
+ url='http://config-server.com', transport='sse'
+ )
+ }
+ ),
+ ),
)
stored_settings = Settings(
- llm_model='gpt-4',
- mcp_config=MCPConfig(
- sse_servers=[MCPSSEServerConfig(url='http://frontend-server.com')]
+ agent_settings=AgentSettings(
+ llm=LLM(model='anthropic/claude-sonnet-4-5-20250929'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'frontend': RemoteMCPServer(
+ url='http://frontend-server.com', transport='sse'
+ )
+ }
+ ),
),
)
@@ -80,20 +108,12 @@ async def test_user_auth_caching_behavior():
with patch.object(
Settings, 'from_config', return_value=config_settings
) as mock_from_config:
- # First call should load and merge
settings1 = await user_auth.get_user_settings()
-
- # Second call should use cached version
settings2 = await user_auth.get_user_settings()
- # Verify both calls return the same merged settings
assert settings1 is settings2
- assert len(settings1.mcp_config.sse_servers) == 2
-
- # Settings store should only be called once (first time)
+ assert len(_sdk_mcp_config(settings1).mcpServers) == 2
mock_settings_store.load.assert_called_once()
-
- # from_config should only be called once (during merging)
mock_from_config.assert_called_once()
diff --git a/tests/unit/mcp/test_mcp_timeout.py b/tests/unit/mcp/test_mcp_timeout.py
index c264c44942..d847384610 100644
--- a/tests/unit/mcp/test_mcp_timeout.py
+++ b/tests/unit/mcp/test_mcp_timeout.py
@@ -3,70 +3,59 @@ from unittest import mock
import pytest
-from openhands.core.config.mcp_config import MCPConfig, MCPSSEServerConfig
+from openhands.core.config.mcp_config import MCPConfig, RemoteMCPServer
from openhands.mcp import MCPClient, create_mcp_clients, fetch_mcp_tools_from_config
@pytest.mark.asyncio
async def test_sse_connection_timeout():
"""Test that SSE connection timeout is handled gracefully."""
- # Create a mock MCPClient
mock_client = mock.MagicMock(spec=MCPClient)
- # Configure the mock to raise a TimeoutError when connect_http is called
async def mock_connect_http(*args, **kwargs):
- await asyncio.sleep(0.1) # Simulate some delay
+ await asyncio.sleep(0.1)
raise asyncio.TimeoutError('Connection timed out')
mock_client.connect_http.side_effect = mock_connect_http
mock_client.disconnect = mock.AsyncMock()
- # Mock the MCPClient constructor to return our mock
with mock.patch('openhands.mcp.utils.MCPClient', return_value=mock_client):
- # Create a list of server URLs to test
- servers = [
- MCPSSEServerConfig(url='http://server1:8080'),
- MCPSSEServerConfig(url='http://server2:8080'),
- ]
+ mcp_config = MCPConfig(
+ mcpServers={
+ 's1': RemoteMCPServer(url='http://server1:8080', transport='sse'),
+ 's2': RemoteMCPServer(url='http://server2:8080', transport='sse'),
+ }
+ )
- # Call create_mcp_clients with the server URLs
- clients = await create_mcp_clients(sse_servers=servers, shttp_servers=[])
+ clients = await create_mcp_clients(mcp_config)
- # Verify that no clients were successfully connected
assert len(clients) == 0
-
- # Verify that connect_http was called for each server
assert mock_client.connect_http.call_count == 2
@pytest.mark.asyncio
async def test_fetch_mcp_tools_with_timeout():
"""Test that fetch_mcp_tools_from_config handles timeouts gracefully."""
- # Create a mock MCPConfig
- mock_config = mock.MagicMock(spec=MCPConfig)
-
- # Configure the mock config
- mock_config.sse_servers = ['http://server1:8080']
- mock_config.shttp_servers = []
+ mock_config = MCPConfig(
+ mcpServers={
+ 's1': RemoteMCPServer(url='http://server1:8080', transport='sse'),
+ }
+ )
- # Mock create_mcp_clients to return an empty list (simulating all connections failing)
with mock.patch('openhands.mcp.utils.create_mcp_clients', return_value=[]):
- # Call fetch_mcp_tools_from_config
tools = await fetch_mcp_tools_from_config(mock_config, None)
-
- # Verify that an empty list of tools is returned
assert tools == []
@pytest.mark.asyncio
async def test_mixed_connection_results():
"""Test that fetch_mcp_tools_from_config returns tools even when some connections fail."""
- # Create a mock MCPConfig
- mock_config = mock.MagicMock(spec=MCPConfig)
-
- # Configure the mock config
- mock_config.sse_servers = ['http://server1:8080', 'http://server2:8080']
- mock_config.shttp_servers = []
+ mock_config = MCPConfig(
+ mcpServers={
+ 's1': RemoteMCPServer(url='http://server1:8080', transport='sse'),
+ 's2': RemoteMCPServer(url='http://server2:8080', transport='sse'),
+ }
+ )
# Create a successful client
successful_client = mock.MagicMock(spec=MCPClient)
diff --git a/tests/unit/mcp/test_mcp_utils.py b/tests/unit/mcp/test_mcp_utils.py
index 2289842da7..ac4cf40a8a 100644
--- a/tests/unit/mcp/test_mcp_utils.py
+++ b/tests/unit/mcp/test_mcp_utils.py
@@ -5,15 +5,19 @@ import pytest
# Import the module, not the functions directly to avoid circular imports
import openhands.mcp.utils
-from openhands.core.config.mcp_config import MCPSSEServerConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import (
+ MCPConfig,
+ RemoteMCPServer,
+ StdioMCPServer,
+)
from openhands.events.action.mcp import MCPAction
from openhands.events.observation.mcp import MCPObservation
@pytest.mark.asyncio
async def test_create_mcp_clients_empty():
- """Test creating MCP clients with empty server list."""
- clients = await openhands.mcp.utils.create_mcp_clients([], [])
+ """Test creating MCP clients with empty config."""
+ clients = await openhands.mcp.utils.create_mcp_clients(MCPConfig(mcpServers={}))
assert clients == []
@@ -21,54 +25,38 @@ async def test_create_mcp_clients_empty():
@patch('openhands.mcp.utils.MCPClient')
async def test_create_mcp_clients_success(mock_mcp_client):
"""Test successful creation of MCP clients."""
- # Setup mock
mock_client_instance = AsyncMock()
mock_mcp_client.return_value = mock_client_instance
mock_client_instance.connect_http = AsyncMock()
- # Test with two servers
- server_configs = [
- MCPSSEServerConfig(url='http://server1:8080'),
- MCPSSEServerConfig(url='http://server2:8080', api_key='test-key'),
- ]
+ s1 = RemoteMCPServer(url='http://server1:8080', transport='sse')
+ s2 = RemoteMCPServer(url='http://server2:8080', transport='sse', auth='test-key')
+ mcp_config = MCPConfig(mcpServers={'s1': s1, 's2': s2})
- clients = await openhands.mcp.utils.create_mcp_clients(server_configs, [])
+ clients = await openhands.mcp.utils.create_mcp_clients(mcp_config)
- # Verify
assert len(clients) == 2
assert mock_mcp_client.call_count == 2
- # Check that connect_http was called with correct parameters
- mock_client_instance.connect_http.assert_any_call(
- server_configs[0], conversation_id=None
- )
- mock_client_instance.connect_http.assert_any_call(
- server_configs[1], conversation_id=None
- )
-
@pytest.mark.asyncio
@patch('openhands.mcp.utils.MCPClient')
async def test_create_mcp_clients_connection_failure(mock_mcp_client):
"""Test handling of connection failures when creating MCP clients."""
- # Setup mock
mock_client_instance = AsyncMock()
mock_mcp_client.return_value = mock_client_instance
- # First connection succeeds, second fails
mock_client_instance.connect_http.side_effect = [
- None, # Success
- Exception('Connection failed'), # Failure
+ None,
+ Exception('Connection failed'),
]
- server_configs = [
- MCPSSEServerConfig(url='http://server1:8080'),
- MCPSSEServerConfig(url='http://server2:8080'),
- ]
+ s1 = RemoteMCPServer(url='http://server1:8080', transport='sse')
+ s2 = RemoteMCPServer(url='http://server2:8080', transport='sse')
+ mcp_config = MCPConfig(mcpServers={'s1': s1, 's2': s2})
- clients = await openhands.mcp.utils.create_mcp_clients(server_configs, [])
+ clients = await openhands.mcp.utils.create_mcp_clients(mcp_config)
- # Verify only one client was successfully created
assert len(clients) == 1
@@ -167,98 +155,75 @@ async def test_call_tool_mcp_success():
@patch('openhands.mcp.utils.MCPClient')
async def test_create_mcp_clients_stdio_success(mock_mcp_client):
"""Test successful creation of MCP clients with stdio servers."""
- # Setup mock
mock_client_instance = AsyncMock()
mock_mcp_client.return_value = mock_client_instance
mock_client_instance.connect_stdio = AsyncMock()
- # Test with stdio servers
- stdio_server_configs = [
- MCPStdioServerConfig(
- name='test-server-1',
- command='python',
- args=['-m', 'server1'],
- env={'DEBUG': 'true'},
- ),
- MCPStdioServerConfig(
- name='test-server-2',
- command='node',
- args=['server2.js'],
- env={'NODE_ENV': 'development'},
- ),
- ]
-
- clients = await openhands.mcp.utils.create_mcp_clients(
- [], [], stdio_servers=stdio_server_configs
+ mcp_config = MCPConfig(
+ mcpServers={
+ 'test-server-1': StdioMCPServer(
+ command='python',
+ args=['-m', 'server1'],
+ env={'DEBUG': 'true'},
+ ),
+ 'test-server-2': StdioMCPServer(
+ command='node',
+ args=['server2.js'],
+ env={'NODE_ENV': 'development'},
+ ),
+ }
)
- # Verify
+ clients = await openhands.mcp.utils.create_mcp_clients(mcp_config)
+
assert len(clients) == 2
assert mock_mcp_client.call_count == 2
- # Check that connect_stdio was called with correct parameters
- mock_client_instance.connect_stdio.assert_any_call(stdio_server_configs[0])
- mock_client_instance.connect_stdio.assert_any_call(stdio_server_configs[1])
-
@pytest.mark.asyncio
@patch('openhands.mcp.utils.MCPClient')
async def test_create_mcp_clients_stdio_connection_failure(mock_mcp_client):
"""Test handling of stdio connection failures when creating MCP clients."""
- # Setup mock
mock_client_instance = AsyncMock()
mock_mcp_client.return_value = mock_client_instance
- # First connection succeeds, second fails
mock_client_instance.connect_stdio.side_effect = [
- None, # Success
- Exception('Stdio connection failed'), # Failure
- ]
-
- stdio_server_configs = [
- MCPStdioServerConfig(name='server1', command='python'),
- MCPStdioServerConfig(name='server2', command='invalid_command'),
+ None,
+ Exception('Stdio connection failed'),
]
- clients = await openhands.mcp.utils.create_mcp_clients(
- [], [], stdio_servers=stdio_server_configs
+ mcp_config = MCPConfig(
+ mcpServers={
+ 'server1': StdioMCPServer(command='python'),
+ 'server2': StdioMCPServer(command='invalid_command'),
+ }
)
- # Verify only one client was successfully created
+ clients = await openhands.mcp.utils.create_mcp_clients(mcp_config)
+
assert len(clients) == 1
@pytest.mark.asyncio
@patch('openhands.mcp.utils.create_mcp_clients')
async def test_fetch_mcp_tools_from_config_with_stdio(mock_create_clients):
- """Test fetching MCP tools with stdio servers enabled."""
- from openhands.core.config.mcp_config import MCPConfig
-
- # Setup mock clients
+ """Test fetching MCP tools with stdio servers."""
mock_client = MagicMock()
mock_tool = MagicMock()
mock_tool.to_param.return_value = {'function': {'name': 'stdio_tool'}}
mock_client.tools = [mock_tool]
mock_create_clients.return_value = [mock_client]
- # Create config with stdio servers
- mcp_config = MCPConfig(
- stdio_servers=[MCPStdioServerConfig(name='test-server', command='python')]
- )
+ mcp_config = MCPConfig(mcpServers={'test-server': StdioMCPServer(command='python')})
- # Test with use_stdio=True
tools = await openhands.mcp.utils.fetch_mcp_tools_from_config(
- mcp_config, conversation_id='test-conv', use_stdio=True
+ mcp_config, conversation_id='test-conv'
)
- # Verify
assert len(tools) == 1
assert tools[0] == {'function': {'name': 'stdio_tool'}}
- # Verify create_mcp_clients was called with stdio servers
- mock_create_clients.assert_called_once_with(
- [], [], 'test-conv', mcp_config.stdio_servers
- )
+ mock_create_clients.assert_called_once_with(mcp_config, 'test-conv')
@pytest.mark.asyncio
diff --git a/tests/unit/runtime/test_runtime_git_tokens.py b/tests/unit/runtime/test_runtime_git_tokens.py
index 2d5f9ec40d..ee285580b9 100644
--- a/tests/unit/runtime/test_runtime_git_tokens.py
+++ b/tests/unit/runtime/test_runtime_git_tokens.py
@@ -5,7 +5,7 @@ import pytest
from pydantic import SecretStr
from openhands.core.config import OpenHandsConfig
-from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import MCPConfig, StdioMCPServer
from openhands.events.action import Action
from openhands.events.action.commands import CmdRunAction
from openhands.events.observation import (
@@ -115,9 +115,7 @@ class MockRuntime(Runtime):
def edit(self, action):
return NullObservation(content='')
- def get_mcp_config(
- self, extra_stdio_servers: list[MCPStdioServerConfig] | None = None
- ):
+ def get_mcp_config(self, extra_stdio_servers: list[StdioMCPServer] | None = None):
return MCPConfig()
diff --git a/tests/unit/server/routes/test_conversation_routes.py b/tests/unit/server/routes/test_conversation_routes.py
index 63b8b79fec..c213c1ada3 100644
--- a/tests/unit/server/routes/test_conversation_routes.py
+++ b/tests/unit/server/routes/test_conversation_routes.py
@@ -24,7 +24,7 @@ from openhands.app_server.app_conversation.app_conversation_service import (
AppConversationService,
)
from openhands.app_server.sandbox.sandbox_models import SandboxStatus
-from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+from openhands.core.config.mcp_config import MCPConfig, StdioMCPServer
from openhands.microagent.microagent import KnowledgeMicroagent, RepoMicroagent
from openhands.microagent.types import MicroagentMetadata, MicroagentType
from openhands.runtime.runtime_status import RuntimeStatus
@@ -69,10 +69,10 @@ async def test_get_microagents():
type=MicroagentType.REPO_KNOWLEDGE,
inputs=[], # Empty inputs to match the expected behavior
mcp_tools=MCPConfig(
- stdio_servers=[
- MCPStdioServerConfig(name='git', command='git'),
- MCPStdioServerConfig(name='file_editor', command='editor'),
- ]
+ mcpServers={
+ 'git': StdioMCPServer(command='git'),
+ 'file_editor': StdioMCPServer(command='editor'),
+ }
),
),
source='test_source',
@@ -88,10 +88,10 @@ async def test_get_microagents():
triggers=['test', 'knowledge'],
inputs=[], # Empty inputs to match the expected behavior
mcp_tools=MCPConfig(
- stdio_servers=[
- MCPStdioServerConfig(name='search', command='search'),
- MCPStdioServerConfig(name='fetch', command='fetch'),
- ]
+ mcpServers={
+ 'search': StdioMCPServer(command='search'),
+ 'fetch': StdioMCPServer(command='fetch'),
+ }
),
),
source='test_source',
diff --git a/tests/unit/server/routes/test_settings_store_functions.py b/tests/unit/server/routes/test_settings_store_functions.py
index 563ae6fad5..fa82ac75d9 100644
--- a/tests/unit/server/routes/test_settings_store_functions.py
+++ b/tests/unit/server/routes/test_settings_store_functions.py
@@ -7,13 +7,15 @@ from fastapi.testclient import TestClient
from pydantic import SecretStr
from openhands.app_server.errors import AuthError
-from openhands.app_server.secrets.secrets_router import (
- check_provider_tokens,
-)
-from openhands.app_server.settings.settings_router import store_llm_settings
-from openhands.core.config.mcp_config import MCPConfig, MCPStdioServerConfig
+from openhands.app_server.secrets.secrets_router import check_provider_tokens
from openhands.integrations.provider import ProviderToken
from openhands.integrations.service_types import ProviderType
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import (
+ AGENT_SETTINGS_SCHEMA_VERSION,
+ AgentSettings,
+ ConversationSettings,
+)
from openhands.server.routes.secrets import (
app as secrets_router,
)
@@ -23,8 +25,42 @@ from openhands.storage.data_models.secrets import Secrets
from openhands.storage.data_models.settings import Settings
from openhands.storage.secrets.file_secrets_store import FileSecretsStore
+_EXPOSE = {'expose_secrets': True}
+
+
+def _apply_settings_payload(
+ payload: dict, existing_settings: Settings | None
+) -> Settings:
+ """Test helper — mirrors the inlined logic in the settings route."""
+ settings = existing_settings.model_copy() if existing_settings else Settings()
+ settings.update(payload)
+ return settings
+
+
+_DEFAULT_LLM = LLM(model='test-model')
+
+
+def _make_settings(llm: LLM | None = None) -> Settings:
+ """Helper to create Settings with an AgentSettings object."""
+ return Settings(agent_settings=AgentSettings(llm=llm or _DEFAULT_LLM))
+
+
+def _secret(s: SecretStr | None) -> str | None:
+ """Unwrap a SecretStr to its plain value."""
+ return s.get_secret_value() if s is not None else None
+
+
+def _persisted(settings: Settings) -> dict:
+ """Dump agent_settings with secrets exposed for persistence assertions."""
+ return settings.agent_settings.model_dump(mode='json', context=_EXPOSE)
+
+
[email protected](autouse=True)
+def allow_short_context_windows():
+ with patch.dict(os.environ, {'ALLOW_SHORT_CONTEXT_WINDOWS': 'true'}, clear=False):
+ yield
+
-# Mock functions to simulate the actual functions in settings.py
async def get_settings_store(request):
"""Mock function to get settings store."""
return MagicMock()
@@ -81,6 +117,7 @@ async def test_check_provider_tokens_valid():
'openhands.app_server.secrets.secrets_router.validate_provider_token'
) as mock_validate:
mock_validate.return_value = ProviderType.GITHUB
+
await check_provider_tokens(providers, existing_provider_tokens)
mock_validate.assert_called_once()
@@ -100,7 +137,6 @@ async def test_check_provider_tokens_invalid():
) as mock_validate:
mock_validate.return_value = None
- # Should raise error for invalid token
with pytest.raises(AuthError):
await check_provider_tokens(providers, existing_provider_tokens)
@@ -110,11 +146,7 @@ async def test_check_provider_tokens_invalid():
@pytest.mark.asyncio
async def test_check_provider_tokens_wrong_type():
"""Test check_provider_tokens with unsupported provider type."""
- # We can't test with an unsupported provider type directly since the model enforces valid types
- # Instead, we'll test with an empty provider_tokens dictionary
providers = POSTProviderModel(provider_tokens={})
-
- # Empty existing provider tokens
existing_provider_tokens = {}
await check_provider_tokens(providers, existing_provider_tokens)
@@ -124,251 +156,382 @@ async def test_check_provider_tokens_wrong_type():
async def test_check_provider_tokens_no_tokens():
"""Test check_provider_tokens with no tokens."""
providers = POSTProviderModel(provider_tokens={})
-
- # Empty existing provider tokens
existing_provider_tokens = {}
await check_provider_tokens(providers, existing_provider_tokens)
-# Tests for store_llm_settings
-async def test_store_llm_settings_new_settings():
- """Test store_llm_settings with new settings."""
- settings = Settings(
- llm_model='gpt-4',
- llm_api_key='test-api-key',
- llm_base_url='https://api.example.com',
+# Tests for _apply_settings_payload (SDK-first settings)
+def test_apply_payload_sdk_keys_stored_and_readable():
+ """Nested SDK keys should be stored in agent_settings and readable via properties."""
+ payload = {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'gpt-4',
+ 'api_key': 'test-api-key',
+ 'base_url': 'https://api.example.com',
+ }
+ },
+ }
+
+ result = _apply_settings_payload(payload, None)
+
+ assert _persisted(result)['llm']['model'] == 'gpt-4'
+ assert _persisted(result)['llm']['api_key'] == 'test-api-key'
+ assert _persisted(result)['llm']['base_url'] == 'https://api.example.com'
+ # Properties read from agent_settings
+ assert result.agent_settings.llm.model == 'gpt-4'
+ assert _secret(result.agent_settings.llm.api_key) == 'test-api-key'
+ assert result.agent_settings.llm.base_url == 'https://api.example.com'
+
+
+def test_apply_payload_updates_existing():
+ """Nested SDK keys should update existing settings."""
+ existing = _make_settings(
+ LLM(
+ model='gpt-3.5',
+ api_key=SecretStr('old-api-key'),
+ base_url='https://old.example.com',
+ )
)
- # No existing settings
- existing_settings = None
+ payload = {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'gpt-4',
+ 'api_key': 'new-api-key',
+ 'base_url': 'https://new.example.com',
+ }
+ },
+ }
- result = await store_llm_settings(settings, existing_settings)
+ result = _apply_settings_payload(payload, existing)
- # Should return settings with the provided values
- assert result.llm_model == 'gpt-4'
- assert result.llm_api_key.get_secret_value() == 'test-api-key'
- assert result.llm_base_url == 'https://api.example.com'
+ assert result.agent_settings.llm.model == 'gpt-4'
+ assert _secret(result.agent_settings.llm.api_key) == 'new-api-key'
+ assert result.agent_settings.llm.base_url == 'https://new.example.com'
-async def test_store_llm_settings_update_existing():
- """Test store_llm_settings updates existing settings."""
- settings = Settings(
- llm_model='gpt-4',
- llm_api_key='new-api-key',
- llm_base_url='https://new.example.com',
- )
-
- # Create existing settings
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('old-api-key'),
- llm_base_url='https://old.example.com',
+def test_apply_payload_preserves_secrets_when_not_provided():
+ """When the API key is not in the payload, the existing value is preserved."""
+ existing = _make_settings(
+ LLM(model='gpt-3.5', api_key=SecretStr('existing-api-key'))
)
- result = await store_llm_settings(settings, existing_settings)
+ payload = {'agent_settings': {'llm': {'model': 'gpt-4'}}}
- # Should return settings with the updated values
- assert result.llm_model == 'gpt-4'
- assert result.llm_api_key.get_secret_value() == 'new-api-key'
- assert result.llm_base_url == 'https://new.example.com'
+ result = _apply_settings_payload(payload, existing)
+ assert result.agent_settings.llm.model == 'gpt-4'
+ assert _secret(result.agent_settings.llm.api_key) == 'existing-api-key'
+ assert result.agent_settings.llm.base_url is None
-async def test_store_llm_settings_partial_update():
- """Test store_llm_settings with partial update.
- Note: When llm_base_url is not provided in the update and the model is NOT an
- openhands model, we attempt to get the URL from litellm.get_api_base().
- For OpenAI models, this returns https://api.openai.com.
- """
- settings = Settings(
- llm_model='gpt-4', # Only updating model (not an openhands model)
- llm_base_url='', # Explicitly cleared (e.g. basic mode save)
+def test_apply_payload_mcp_update_preserves_existing_llm_settings():
+ existing_settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='anthropic/claude-sonnet-4-5-20250929',
+ api_key=SecretStr('existing-api-key'),
+ base_url='https://my-custom-proxy.example.com',
+ )
+ ),
)
- # Create existing settings
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('existing-api-key'),
- llm_base_url='https://existing.example.com',
+ result = _apply_settings_payload(
+ {
+ 'agent_settings': {
+ 'mcp_config': {
+ 'stdio_servers': [
+ {
+ 'name': 'my-server',
+ 'command': 'npx',
+ 'args': ['-y', '@my/mcp-server'],
+ 'env': {
+ 'API_TOKEN': 'secret123',
+ 'ENDPOINT': 'https://example.com',
+ },
+ }
+ ]
+ }
+ }
+ },
+ existing_settings,
)
- result = await store_llm_settings(settings, existing_settings)
+ assert result.agent_settings.llm.model == 'anthropic/claude-sonnet-4-5-20250929'
+ assert _secret(result.agent_settings.llm.api_key) == 'existing-api-key'
+ assert result.agent_settings.llm.base_url == 'https://my-custom-proxy.example.com'
- # Should return settings with updated model but keep API key
- assert result.llm_model == 'gpt-4'
- # For SecretStr objects, we need to compare the secret value
- assert result.llm_api_key.get_secret_value() == 'existing-api-key'
- # llm_base_url="" is an explicit clear — must not be repopulated via auto-detection
- assert result.llm_base_url is None
+def test_apply_payload_clears_secrets_when_explicitly_null_or_empty():
+ """Explicit null/empty secret values should clear existing SDK secrets."""
+ existing = _make_settings(
+ LLM(
+ model='anthropic/claude-sonnet-4-5-20250929',
+ api_key=SecretStr('existing-api-key'),
+ )
+ )
-async def test_store_llm_settings_advanced_view_clear_removes_base_url():
- """Regression test for #13420: clearing Base URL in Advanced view must persist.
+ payload = {'agent_settings': {'llm': {'api_key': None}}}
+ result = _apply_settings_payload(payload, existing)
+ assert result.agent_settings.llm.api_key is None
- Before the fix, llm_base_url="" was treated identically to llm_base_url=None,
- causing the backend to re-run auto-detection and overwrite the user's intent.
- """
- settings = Settings(
- llm_model='gpt-4',
- llm_base_url='', # User deleted the field in Advanced view
- )
+ payload = {'agent_settings': {'llm': {'api_key': ''}}}
+ result = _apply_settings_payload(payload, existing)
+ assert result.agent_settings.llm.api_key is None
- existing_settings = Settings(
- llm_model='gpt-4',
- llm_api_key=SecretStr('my-api-key'),
- llm_base_url='https://my-custom-proxy.example.com',
+
+def test_apply_payload_preserves_explicit_null_non_secret_sdk_resets():
+ """Explicit null non-secret SDK values should survive for inherited-settings clearing."""
+ existing = _make_settings(
+ LLM(model='openai/gpt-4o', base_url='https://custom.example/v1')
)
- result = await store_llm_settings(settings, existing_settings)
+ result = _apply_settings_payload(
+ {'agent_settings': {'llm': {'base_url': None}}}, existing
+ )
- # The old custom URL must not come back
- assert result.llm_base_url is None
+ assert result.agent_settings.llm.base_url is None
+ assert _persisted(result)['llm']['base_url'] is None
-async def test_store_llm_settings_mcp_update_preserves_base_url():
- """Test that saving MCP config (without LLM fields) preserves existing base URL.
+def test_apply_payload_mcp_preserves_llm_settings():
+ """Non-LLM payloads (e.g. MCP config) should not affect existing LLM settings."""
+ existing = _make_settings(
+ LLM(
+ model='anthropic/claude-sonnet-4-5-20250929',
+ api_key=SecretStr('existing-api-key'),
+ base_url='https://my-custom-proxy.example.com',
+ )
+ )
- Regression test: When adding an MCP server, the frontend sends only mcp_config
- and v1_enabled. This should not wipe out the existing llm_base_url.
- """
- # Simulate what the MCP add/update/delete mutations send: mcp_config but no LLM fields
- settings = Settings(
- mcp_config=MCPConfig(
- stdio_servers=[
- MCPStdioServerConfig(
- name='my-server',
- command='npx',
- args=['-y', '@my/mcp-server'],
- env={'API_TOKEN': 'secret123', 'ENDPOINT': 'https://example.com'},
- )
- ],
+ payload = {
+ 'agent_settings': {
+ 'mcp_config': {
+ 'stdio_servers': [
+ {
+ 'name': 'my-server',
+ 'command': 'npx',
+ 'args': ['-y', '@my/mcp-server'],
+ }
+ ],
+ },
+ },
+ }
+
+ result = _apply_settings_payload(payload, existing)
+
+ assert result.agent_settings.llm.model == 'anthropic/claude-sonnet-4-5-20250929'
+ assert _secret(result.agent_settings.llm.api_key) == 'existing-api-key'
+ assert result.agent_settings.llm.base_url == 'https://my-custom-proxy.example.com'
+
+
+def test_apply_payload_non_sdk_flat_keys_applied():
+ """Non-SDK flat keys (language, git, etc.) should still be applied normally."""
+ payload = {
+ 'language': 'ja',
+ 'git_user_name': 'test-user',
+ }
+
+ result = _apply_settings_payload(payload, None)
+
+ assert result.language == 'ja'
+ assert result.git_user_name == 'test-user'
+
+
+def test_apply_payload_conversation_settings_stored_top_level():
+ """Conversation security settings should be applied as top-level Settings fields."""
+ payload = {
+ 'conversation_settings': {
+ 'confirmation_mode': True,
+ 'security_analyzer': 'llm',
+ },
+ }
+
+ result = _apply_settings_payload(payload, None)
+
+ assert result.conversation_settings.confirmation_mode is True
+ assert result.conversation_settings.security_analyzer == 'llm'
+ assert not hasattr(result.agent_settings, 'confirmation_mode')
+
+
+def test_agent_settings_construction():
+ """Settings constructed with proper objects should be accessible."""
+ s = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='gpt-4',
+ api_key=SecretStr('my-key'),
+ base_url='https://example.com',
+ ),
+ agent='CodeActAgent',
),
+ conversation_settings=ConversationSettings(confirmation_mode=True),
)
- # Create existing settings with a custom base URL
- existing_settings = Settings(
- llm_model='anthropic/claude-sonnet-4-5-20250929',
- llm_api_key=SecretStr('existing-api-key'),
- llm_base_url='https://my-custom-proxy.example.com',
- )
+ assert _persisted(s)['llm']['model'] == 'gpt-4'
+ assert _persisted(s)['llm']['api_key'] == 'my-key'
+ assert _persisted(s)['llm']['base_url'] == 'https://example.com'
+ assert _persisted(s)['agent'] == 'CodeActAgent'
+ assert s.conversation_settings.confirmation_mode is True
+ assert s.agent_settings.llm.model == 'gpt-4'
+ assert s.agent_settings.agent == 'CodeActAgent'
- result = await store_llm_settings(settings, existing_settings)
- # All existing LLM settings should be preserved
- assert result.llm_model == 'anthropic/claude-sonnet-4-5-20250929'
- assert result.llm_api_key.get_secret_value() == 'existing-api-key'
- assert result.llm_base_url == 'https://my-custom-proxy.example.com'
+def test_agent_settings_normalized_with_schema_version_and_extras():
+ s = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='anthropic/claude-sonnet-4-5-20250929'),
+ ),
+ conversation_settings=ConversationSettings(
+ max_iterations=64,
+ confirmation_mode=True,
+ ),
+ )
+ dump = s.agent_settings.model_dump(mode='json', context={'expose_secrets': True})
+ assert dump['schema_version'] == AGENT_SETTINGS_SCHEMA_VERSION
+ assert _persisted(s)['llm']['model'] == 'anthropic/claude-sonnet-4-5-20250929'
+ assert s.conversation_settings.confirmation_mode is True
+ assert s.conversation_settings.max_iterations == 64
-async def test_store_llm_settings_no_existing_base_url_uses_auto_detection():
- """Test auto-detection kicks in only when there is no existing base URL.
- When neither the incoming settings nor existing settings have a base URL,
- auto-detection from litellm should be used.
- """
- settings = Settings(
- llm_model='gpt-4' # Not an openhands model
+def test_agent_settings_persistence_strips_secret_values():
+ s = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='anthropic/claude-sonnet-4-5-20250929',
+ api_key=SecretStr('super-secret'),
+ ),
+ ),
+ conversation_settings=ConversationSettings(max_iterations=64),
)
- # Existing settings without a base URL
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('existing-api-key'),
- )
+ persisted = s.agent_settings.model_dump(mode='json')
+ # Secrets are redacted by default (not exposed)
+ assert persisted['schema_version'] == AGENT_SETTINGS_SCHEMA_VERSION
+ assert persisted['llm']['model'] == 'anthropic/claude-sonnet-4-5-20250929'
+ assert 'max_iterations' not in persisted
+ assert persisted['llm']['api_key'] == '**********'
+ assert s.conversation_settings.max_iterations == 64
- result = await store_llm_settings(settings, existing_settings)
- assert result.llm_model == 'gpt-4'
- assert result.llm_api_key.get_secret_value() == 'existing-api-key'
- # No existing base URL, so auto-detection should set it
- assert result.llm_base_url == 'https://api.openai.com'
+def test_openhands_model_settings_remain_user_facing():
+ s = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='openhands/claude-opus-4-5-20251101')
+ )
+ )
+ assert _persisted(s)['llm']['model'] == 'litellm_proxy/claude-opus-4-5-20251101'
+ api_data = s.get_agent_settings_display()
+ assert api_data['llm']['model'] == 'openhands/claude-opus-4-5-20251101'
-async def test_store_llm_settings_anthropic_model_gets_api_base():
- """Test store_llm_settings with an Anthropic model.
- For Anthropic models, get_provider_api_base() returns the Anthropic API base URL
- via ProviderConfigManager.get_provider_model_info().
- """
- settings = Settings(
- llm_model='anthropic/claude-sonnet-4-5-20250929' # Anthropic model
+def test_litellm_proxy_model_settings_migrate_back_to_openhands_prefix():
+ s = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='litellm_proxy/claude-opus-4-5-20251101')
+ )
)
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('existing-api-key'),
- )
+ assert _persisted(s)['llm']['model'] == 'litellm_proxy/claude-opus-4-5-20251101'
+ api_data = s.get_agent_settings_display()
+ assert api_data['llm']['model'] == 'openhands/claude-opus-4-5-20251101'
- result = await store_llm_settings(settings, existing_settings)
- assert result.llm_model == 'anthropic/claude-sonnet-4-5-20250929'
- assert result.llm_api_key.get_secret_value() == 'existing-api-key'
- # Anthropic models get https://api.anthropic.com via ProviderConfigManager
- assert result.llm_base_url == 'https://api.anthropic.com'
+# ──────────────────────────────────────────────────────────────────
+# Regression tests for openhands/ → litellm_proxy/ round-trip bug
+# ──────────────────────────────────────────────────────────────────
+# The SDK's AgentSettings.model_validate automatically transforms
+# "openhands/X" → "litellm_proxy/X" with a proxy base_url. The
+# settings router must convert it back for the frontend and handle
+# the internal model name in is_openhands_model-style checks.
-async def test_store_llm_settings_litellm_error_logged():
- """Test that litellm errors are logged when getting api_base fails."""
- from unittest.mock import patch
+def test_post_merge_llm_fixups_handles_openhands_model_after_sdk_transform():
+ """After SDK transforms openhands/X → litellm_proxy/X with a base_url,
+ _post_merge_llm_fixups should recognise it as a managed model and not
+ clobber the base_url with a provider lookup."""
+ from openhands.app_server.settings.settings_router import _post_merge_llm_fixups
- settings = Settings(
- llm_model='unknown-model-xyz' # A model that litellm won't recognize
- )
+ # Simulate: user sends openhands/claude-opus-4-5, sdk transforms it
+ settings = Settings()
+ settings.update({'agent_settings': {'llm': {'model': 'openhands/claude-opus-4-5'}}})
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('existing-api-key'),
- )
+ # After SDK transform:
+ assert settings.agent_settings.llm.model == 'litellm_proxy/claude-opus-4-5'
+ assert settings.agent_settings.llm.base_url is not None # SDK set it
+
+ # _post_merge_llm_fixups should NOT break the base_url
+ _post_merge_llm_fixups(settings)
+ assert settings.agent_settings.llm.base_url is not None
- # The function should not raise even if litellm fails
- with patch('openhands.app_server.settings.settings_router.logger') as mock_logger:
- result = await store_llm_settings(settings, existing_settings)
- # llm_base_url should remain None since litellm couldn't find the model
- assert result.llm_base_url is None
- # Either error or debug should have been logged
- assert mock_logger.error.called or mock_logger.debug.called
+def test_post_merge_llm_fixups_sets_proxy_url_for_openhands_model_with_null_base_url():
+ """When an openhands model ends up with a null base_url (edge case from
+ older storage), _post_merge_llm_fixups should set the proxy URL."""
+ from openhands.app_server.settings.settings_router import (
+ LITE_LLM_API_URL,
+ _post_merge_llm_fixups,
+ )
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='litellm_proxy/claude-opus-4-5', base_url=None)
+ ),
+ )
+ # Force base_url to None (bypass SDK validator for this edge case)
+ settings.agent_settings.llm.base_url = None
-async def test_store_llm_settings_openhands_model_gets_default_url():
- """Test store_llm_settings with openhands model gets LiteLLM proxy URL.
+ _post_merge_llm_fixups(settings)
- When llm_base_url is not provided and the model is an openhands model,
- it gets set to the default LiteLLM proxy URL.
- """
- import os
+ # Should recognise litellm_proxy/ as a managed model and set the URL
+ assert settings.agent_settings.llm.base_url == LITE_LLM_API_URL
- settings = Settings(
- llm_model='openhands/claude-sonnet-4-5-20250929' # openhands model
+
+def test_get_agent_settings_display_clears_proxy_base_url():
+ """get_agent_settings_display should clear the LiteLLM proxy base_url
+ for openhands models so the frontend sees null (enabling basic mode)."""
+ s = Settings(
+ agent_settings=AgentSettings(llm=LLM(model='openhands/claude-opus-4-5'))
)
- # Create existing settings
- existing_settings = Settings(
- llm_model='gpt-3.5',
- llm_api_key=SecretStr('existing-api-key'),
+ # SDK sets the proxy URL internally
+ assert s.agent_settings.llm.base_url is not None
+
+ display = s.get_agent_settings_display()
+ # Model name should be converted back
+ assert display['llm']['model'] == 'openhands/claude-opus-4-5'
+ # Proxy base_url should be cleared for display
+ assert display['llm']['base_url'] is None
+
+
+def test_save_then_display_roundtrip_openhands_model():
+ """Full round-trip: save openhands model via update(), then display it.
+ The frontend should see openhands/X with null base_url (basic mode)."""
+ # Simulate save
+ settings = Settings()
+ settings.update(
+ {
+ 'agent_settings': {
+ 'llm': {
+ 'model': 'openhands/claude-opus-4-5',
+ 'api_key': '',
+ 'base_url': None,
+ }
+ }
+ }
)
- result = await store_llm_settings(settings, existing_settings)
+ # Verify internal representation
+ assert settings.agent_settings.llm.model == 'litellm_proxy/claude-opus-4-5'
- # Should return settings with updated model
- assert result.llm_model == 'openhands/claude-sonnet-4-5-20250929'
- # For SecretStr objects, we need to compare the secret value
- assert result.llm_api_key.get_secret_value() == 'existing-api-key'
- # openhands models get the LiteLLM proxy URL
- expected_base_url = os.environ.get(
- 'LITE_LLM_API_URL', 'https://llm-proxy.app.all-hands.dev'
- )
- assert result.llm_base_url == expected_base_url
+ # Simulate load response
+ display = settings.get_agent_settings_display()
+ assert display['llm']['model'] == 'openhands/claude-opus-4-5'
+ assert display['llm']['base_url'] is None
# Tests for store_provider_tokens
diff --git a/tests/unit/server/session/test_conversation_init_data.py b/tests/unit/server/session/test_conversation_init_data.py
index 739729ca2d..9d8ccc0197 100644
--- a/tests/unit/server/session/test_conversation_init_data.py
+++ b/tests/unit/server/session/test_conversation_init_data.py
@@ -11,6 +11,7 @@ import pytest
from pydantic import SecretStr
from openhands.integrations.provider import CustomSecret, ProviderToken, ProviderType
+from openhands.sdk.settings import AGENT_SETTINGS_SCHEMA_VERSION
from openhands.server.session.conversation_init_data import ConversationInitData
from openhands.storage.data_models.settings import Settings
@@ -273,6 +274,14 @@ class TestConversationInitDataValidator:
)
+def test_conversation_init_data_default_agent_settings_initializes():
+ """Frozen subclasses should still normalize default agent_settings."""
+ init_data = ConversationInitData()
+
+ assert init_data.agent_settings.schema_version == AGENT_SETTINGS_SCHEMA_VERSION
+ assert init_data.agent_settings.agent == 'CodeActAgent'
+
+
def test_conversation_init_data_no_pydantic_frozen_field_warning():
"""Test that ConversationInitData model does not trigger Pydantic UnsupportedFieldAttributeWarning.
diff --git a/tests/unit/storage/data_models/test_settings.py b/tests/unit/storage/data_models/test_settings.py
index 868eeeda77..b202861eb2 100644
--- a/tests/unit/storage/data_models/test_settings.py
+++ b/tests/unit/storage/data_models/test_settings.py
@@ -1,23 +1,29 @@
import warnings
from unittest.mock import patch
+from fastmcp.mcp_config import MCPConfig
from pydantic import SecretStr
-from openhands.app_server.settings.settings_router import convert_to_settings
from openhands.core.config.llm_config import LLMConfig
from openhands.core.config.openhands_config import OpenHandsConfig
from openhands.core.config.sandbox_config import SandboxConfig
from openhands.core.config.security_config import SecurityConfig
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import (
+ AGENT_SETTINGS_SCHEMA_VERSION,
+ AgentSettings,
+ ConversationSettings,
+)
+from openhands.sdk.settings.model import CondenserSettings, VerificationSettings
from openhands.storage.data_models.settings import Settings
def test_settings_from_config():
- # Mock configuration
mock_app_config = OpenHandsConfig(
default_agent='test-agent',
max_iterations=100,
security=SecurityConfig(
- security_analyzer='test-analyzer',
+ security_analyzer='llm',
confirmation_mode=True,
),
llms={
@@ -38,24 +44,23 @@ def test_settings_from_config():
assert settings is not None
assert settings.language == 'en'
- assert settings.agent == 'test-agent'
- assert settings.max_iterations == 100
- assert settings.security_analyzer == 'test-analyzer'
- assert settings.confirmation_mode is True
- assert settings.llm_model == 'test-model'
- assert settings.llm_api_key.get_secret_value() == 'test-key'
- assert settings.llm_base_url == 'https://test.example.com'
+ assert settings.agent_settings.agent == 'test-agent'
+ assert settings.conversation_settings.max_iterations == 100
+ assert settings.conversation_settings.security_analyzer == 'llm'
+ assert settings.conversation_settings.confirmation_mode is True
+ assert settings.agent_settings.llm.model == 'test-model'
+ assert settings.agent_settings.llm.api_key.get_secret_value() == 'test-key'
+ assert settings.agent_settings.llm.base_url == 'https://test.example.com'
assert settings.remote_runtime_resource_factor == 2
assert not settings.secrets_store.provider_tokens
def test_settings_from_config_no_api_key():
- # Mock configuration without API key
mock_app_config = OpenHandsConfig(
default_agent='test-agent',
max_iterations=100,
security=SecurityConfig(
- security_analyzer='test-analyzer',
+ security_analyzer='llm',
confirmation_mode=True,
),
llms={
@@ -77,49 +82,237 @@ def test_settings_from_config_no_api_key():
def test_settings_handles_sensitive_data():
settings = Settings(
language='en',
- agent='test-agent',
- max_iterations=100,
- security_analyzer='test-analyzer',
- confirmation_mode=True,
- llm_model='test-model',
- llm_api_key='test-key',
- llm_base_url='https://test.example.com',
+ agent_settings=AgentSettings(
+ agent='test-agent',
+ llm=LLM(
+ model='test-model',
+ api_key=SecretStr('test-key'),
+ base_url='https://test.example.com',
+ ),
+ ),
+ conversation_settings=ConversationSettings(
+ max_iterations=100,
+ security_analyzer='llm',
+ confirmation_mode=True,
+ ),
remote_runtime_resource_factor=2,
)
- assert str(settings.llm_api_key) == '**********'
- assert settings.llm_api_key.get_secret_value() == 'test-key'
+ llm_api_key = settings.agent_settings.llm.api_key
+ assert str(llm_api_key) == '**********'
+ assert llm_api_key.get_secret_value() == 'test-key'
-def test_convert_to_settings():
- settings_with_token_data = Settings(
- llm_api_key='test-key',
+def test_settings_update_deep_merges_agent_settings():
+ """Updating agent_settings with a partial dict must not overwrite sibling sub-fields."""
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='existing-model', api_key=SecretStr('existing-key')),
+ condenser=CondenserSettings(enabled=True, max_size=200),
+ ),
)
- settings = convert_to_settings(settings_with_token_data)
+ settings.update({'agent_settings': {'condenser': {'max_size': 300}}})
- assert settings.llm_api_key.get_secret_value() == 'test-key'
+ assert settings.agent_settings.llm.model == 'existing-model'
+ assert settings.agent_settings.llm.api_key.get_secret_value() == 'existing-key'
+ assert settings.agent_settings.condenser.max_size == 300
+ assert settings.agent_settings.condenser.enabled is True
-def test_settings_no_pydantic_frozen_field_warning():
- """Test that Settings model does not trigger Pydantic UnsupportedFieldAttributeWarning.
+def test_settings_preserve_agent_settings():
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='test-model',
+ api_key=SecretStr('test-key'),
+ litellm_extra_body={'metadata': {'tier': 'pro'}},
+ ),
+ verification=VerificationSettings(
+ critic_enabled=True,
+ critic_mode='all_actions',
+ ),
+ ),
+ )
- This test ensures that the 'frozen' parameter is not incorrectly used in Field()
- definitions, which would cause warnings in Pydantic v2 for union types.
- See: https://github.com/All-Hands-AI/infra/issues/860
- """
+ assert settings.agent_settings.llm.api_key.get_secret_value() == 'test-key'
+ dump = settings.agent_settings.model_dump(
+ mode='json', context={'expose_secrets': True}
+ )
+
+ assert dump['schema_version'] == AGENT_SETTINGS_SCHEMA_VERSION
+ assert dump['llm']['model'] == 'test-model'
+ assert dump['llm']['api_key'] == 'test-key'
+ assert dump['verification']['critic_enabled'] is True
+ assert dump['verification']['critic_mode'] == 'all_actions'
+ assert dump['llm']['litellm_extra_body'] == {'metadata': {'tier': 'pro'}}
+
+
+def test_settings_to_agent_settings_uses_agent_vals():
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(
+ model='sdk-model',
+ base_url='https://sdk.example.com',
+ litellm_extra_body={'metadata': {'tier': 'enterprise'}},
+ ),
+ condenser=CondenserSettings(enabled=False, max_size=88),
+ verification=VerificationSettings(
+ critic_enabled=True, critic_mode='all_actions'
+ ),
+ ),
+ )
+
+ agent_settings = settings.to_agent_settings()
+
+ assert agent_settings.llm.model == 'sdk-model'
+ assert agent_settings.llm.base_url == 'https://sdk.example.com'
+ assert agent_settings.llm.litellm_extra_body == {'metadata': {'tier': 'enterprise'}}
+ assert agent_settings.condenser.enabled is False
+ assert agent_settings.condenser.max_size == 88
+ assert agent_settings.verification.critic_enabled is True
+ assert agent_settings.verification.critic_mode == 'all_actions'
+
+
+def test_settings_agent_settings_keeps_sdk_mcp_shape_canonical():
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='sdk-model'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'sse_server': {
+ 'url': 'https://example.com/sse',
+ 'transport': 'sse',
+ }
+ },
+ ),
+ ),
+ )
+
+ mcp_config = settings.agent_settings.mcp_config
+ assert mcp_config is not None
+ servers = mcp_config.mcpServers
+ assert 'sse_server' in servers
+ assert servers['sse_server'].transport == 'sse'
+ assert servers['sse_server'].url == 'https://example.com/sse'
+
+ api_values = settings.agent_settings.model_dump(mode='json')
+ assert 'sse_server' in api_values['mcp_config']['mcpServers']
+
+
+def test_settings_update_mcp_config():
+ settings = Settings(agent_settings=AgentSettings(llm=LLM(model='sdk-model')))
+
+ settings.update(
+ {
+ 'agent_settings': {
+ 'mcp_config': {
+ 'mcpServers': {
+ 'custom': {
+ 'transport': 'http',
+ 'url': 'https://example.com/mcp',
+ }
+ }
+ }
+ }
+ }
+ )
+
+ mcp = settings.agent_settings.mcp_config
+ assert mcp is not None
+ assert 'custom' in mcp.mcpServers
+ assert mcp.mcpServers['custom'].transport == 'http'
+ assert mcp.mcpServers['custom'].url == 'https://example.com/mcp'
+
+
+def test_settings_update_replaces_existing_mcp_servers():
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='sdk-model'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'stale': {
+ 'transport': 'sse',
+ 'url': 'https://example.com/stale',
+ }
+ }
+ ),
+ )
+ )
+
+ settings.update(
+ {
+ 'agent_settings': {
+ 'mcp_config': {
+ 'mcpServers': {
+ 'fresh': {
+ 'transport': 'http',
+ 'url': 'https://example.com/fresh',
+ }
+ }
+ }
+ }
+ }
+ )
+
+ mcp = settings.agent_settings.mcp_config
+ assert mcp is not None
+ assert set(mcp.mcpServers) == {'fresh'}
+ assert mcp.mcpServers['fresh'].url == 'https://example.com/fresh'
+
+
+def test_settings_update_can_clear_mcp_config():
+ settings = Settings(
+ agent_settings=AgentSettings(
+ llm=LLM(model='sdk-model'),
+ mcp_config=MCPConfig(
+ mcpServers={
+ 'custom': {
+ 'transport': 'http',
+ 'url': 'https://example.com/mcp',
+ }
+ }
+ ),
+ )
+ )
+
+ settings.update({'agent_settings': {'mcp_config': None}})
+
+ assert settings.agent_settings.mcp_config is None
+
+
+def test_settings_update_batch():
+ settings = Settings()
+ settings.update(
+ {
+ 'language': 'fr',
+ 'agent_settings': {
+ 'agent': 'TestAgent',
+ 'llm': {'model': 'new-model', 'api_key': 'new-key'},
+ },
+ 'conversation_settings': {
+ 'max_iterations': 200,
+ },
+ }
+ )
+ assert settings.language == 'fr'
+ assert settings.agent_settings.agent == 'TestAgent'
+ assert settings.agent_settings.llm.model == 'new-model'
+ assert settings.agent_settings.llm.api_key.get_secret_value() == 'new-key'
+ assert settings.conversation_settings.max_iterations == 200
+
+
+def test_settings_no_pydantic_frozen_field_warning():
+ """Test that Settings model does not trigger Pydantic UnsupportedFieldAttributeWarning."""
with warnings.catch_warnings(record=True) as w:
warnings.simplefilter('always')
- # Re-import to trigger any warnings during model definition
import importlib
import openhands.storage.data_models.settings
importlib.reload(openhands.storage.data_models.settings)
- # Check for warnings containing 'frozen' which would indicate
- # incorrect usage of frozen=True in Field()
frozen_warnings = [
warning for warning in w if 'frozen' in str(warning.message).lower()
]
diff --git a/tests/unit/storage/settings/test_file_settings_store.py b/tests/unit/storage/settings/test_file_settings_store.py
index f5b0113a24..38500db701 100644
--- a/tests/unit/storage/settings/test_file_settings_store.py
+++ b/tests/unit/storage/settings/test_file_settings_store.py
@@ -1,8 +1,12 @@
+import os
from unittest.mock import MagicMock, patch
import pytest
+from pydantic import SecretStr
from openhands.core.config.openhands_config import OpenHandsConfig
+from openhands.sdk.llm import LLM
+from openhands.sdk.settings import AgentSettings, ConversationSettings
from openhands.storage.data_models.settings import Settings
from openhands.storage.files import FileStore
from openhands.storage.settings.file_settings_store import FileSettingsStore
@@ -13,6 +17,12 @@ def mock_file_store():
return MagicMock(spec=FileStore)
[email protected](autouse=True)
+def allow_short_context_windows():
+ with patch.dict(os.environ, {'ALLOW_SHORT_CONTEXT_WINDOWS': 'true'}, clear=False):
+ yield
+
+
@pytest.fixture
def file_settings_store(mock_file_store):
return FileSettingsStore(mock_file_store)
@@ -33,20 +43,28 @@ async def test_store_and_load_data(file_settings_store):
# Test data
init_data = Settings(
language='python',
- agent='test-agent',
- max_iterations=100,
- security_analyzer='default',
- confirmation_mode=True,
- llm_model='test-model',
- llm_api_key='test-key',
- llm_base_url='https://test.com',
+ agent_settings=AgentSettings(
+ agent='test-agent',
+ llm=LLM(
+ model='test-model',
+ api_key=SecretStr('test-key'),
+ base_url='https://test.com',
+ ),
+ ),
+ conversation_settings=ConversationSettings(
+ max_iterations=100,
+ security_analyzer='llm',
+ confirmation_mode=True,
+ ),
)
# Store data
await file_settings_store.store(init_data)
# Verify store called with correct JSON
- expected_json = init_data.model_dump_json(context={'expose_secrets': True})
+ expected_json = init_data.model_dump_json(
+ context={'expose_secrets': True, 'persist_settings': True}
+ )
file_settings_store.file_store.write.assert_called_once_with(
'settings.json', expected_json
)
@@ -58,18 +76,29 @@ async def test_store_and_load_data(file_settings_store):
loaded_data = await file_settings_store.load()
assert loaded_data is not None
assert loaded_data.language == init_data.language
- assert loaded_data.agent == init_data.agent
- assert loaded_data.max_iterations == init_data.max_iterations
- assert loaded_data.security_analyzer == init_data.security_analyzer
- assert loaded_data.confirmation_mode == init_data.confirmation_mode
- assert loaded_data.llm_model == init_data.llm_model
- assert loaded_data.llm_api_key
- assert init_data.llm_api_key
+ assert loaded_data.agent_settings.agent == init_data.agent_settings.agent
+ assert (
+ loaded_data.conversation_settings.max_iterations
+ == init_data.conversation_settings.max_iterations
+ )
+ assert (
+ loaded_data.conversation_settings.security_analyzer
+ == init_data.conversation_settings.security_analyzer
+ )
+ assert (
+ loaded_data.conversation_settings.confirmation_mode
+ == init_data.conversation_settings.confirmation_mode
+ )
+ assert loaded_data.agent_settings.llm.model == init_data.agent_settings.llm.model
+ assert loaded_data.agent_settings.llm.api_key is not None
+ assert init_data.agent_settings.llm.api_key is not None
+ assert (
+ loaded_data.agent_settings.llm.api_key.get_secret_value()
+ == init_data.agent_settings.llm.api_key.get_secret_value()
+ )
assert (
- loaded_data.llm_api_key.get_secret_value()
- == init_data.llm_api_key.get_secret_value()
+ loaded_data.agent_settings.llm.base_url == init_data.agent_settings.llm.base_url
)
- assert loaded_data.llm_base_url == init_data.llm_base_url
@pytest.mark.asyncio
diff --git a/uv.lock b/uv.lock
index 4593a7afb0..875ea73526 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2864,13 +2864,12 @@ wheels = [
[[package]]
name = "litellm"
-version = "1.80.10"
+version = "1.83.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "aiohttp" },
{ name = "click" },
{ name = "fastuuid" },
- { name = "grpcio" },
{ name = "httpx" },
{ name = "importlib-metadata" },
{ name = "jinja2" },
@@ -2881,9 +2880,9 @@ dependencies = [
{ name = "tiktoken" },
{ name = "tokenizers" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/dd/44/0aaa7449e7c4aa05668ec03f1f68a01b1e476591071d9659a68db19371a2/litellm-1.80.10.tar.gz", hash = "sha256:4a4aff7558945c2f7e5c6523e67c1b5525a46b10b0e1ad6b8f847cb13b16779e", size = 12764777, upload-time = "2025-12-14T02:07:05.362Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/22/92/6ce9737554994ca8e536e5f4f6a87cc7c4774b656c9eb9add071caf7d54b/litellm-1.83.0.tar.gz", hash = "sha256:860bebc76c4bb27b4cf90b4a77acd66dba25aced37e3db98750de8a1766bfb7a", size = 17333062, upload-time = "2026-03-31T05:08:25.331Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/8c/a9/4814b6aa58f6705df2831eaadeb5bc8240684c8c9d5964245212f85049d1/litellm-1.80.10-py3-none-any.whl", hash = "sha256:9b3e561efaba0eb1291cb1555d3dcb7283cf7f3cb65aadbcdb42e2a8765898c8", size = 11264240, upload-time = "2025-12-14T02:07:02.414Z" },
+ { url = "https://files.pythonhosted.org/packages/19/2c/a670cc050fcd6f45c6199eb99e259c73aea92edba8d5c2fc1b3686d36217/litellm-1.83.0-py3-none-any.whl", hash = "sha256:88c536d339248f3987571493015784671ba3f193a328e1ea6780dbebaa2094a8", size = 15610306, upload-time = "2026-03-31T05:08:21.987Z" },
]
[[package]]
@@ -3642,7 +3641,7 @@ wheels = [
[[package]]
name = "openhands-agent-server"
-version = "1.16.1"
+version = "1.17.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "aiosqlite" },
@@ -3656,9 +3655,9 @@ dependencies = [
{ name = "websockets" },
{ name = "wsproto" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/8b/69/792ba587c4bb0571f8610b4baa08854f1addd992a648ab20795dbdcfcdd4/openhands_agent_server-1.16.1.tar.gz", hash = "sha256:489151d35250a424dede8646396bef7b7095adb25e5c973ca8bc6dcbd19cdf07", size = 80655, upload-time = "2026-04-02T15:21:50.03Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/3c/05/18c26aab8094d3a7757338586fdaa13e3c0efa7ed1fe87a349a3159a920f/openhands_agent_server-1.17.0.tar.gz", hash = "sha256:3a88449a3b9ded653dcd2a8c518810c75602873cf9f7d4e8f9b90fd8fd225652", size = 82852, upload-time = "2026-04-13T19:04:38.929Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/13/bd/3b62cab04d8bbabc9f3fc6875538d9c7db22d39839322df4c9a212820184/openhands_agent_server-1.16.1-py3-none-any.whl", hash = "sha256:015983b300510c9c329c8eace49fbd4117d31d0895a125e419c31a9964be4155", size = 96943, upload-time = "2026-04-02T15:21:53.153Z" },
+ { url = "https://files.pythonhosted.org/packages/1e/0e/5997c52925219e302fffdb78a981e36a572badcf936c618a8870a70e677e/openhands_agent_server-1.17.0-py3-none-any.whl", hash = "sha256:44336cad001c31caeb516481a5a7aea6dd9b5ab4798461f147b5231668d8fb74", size = 99499, upload-time = "2026-04-13T19:04:42.069Z" },
]
[[package]]
@@ -3827,9 +3826,9 @@ requires-dist = [
{ name = "numpy" },
{ name = "openai", specifier = "==2.8" },
{ name = "openhands-aci", specifier = "==0.3.3" },
- { name = "openhands-agent-server", specifier = "==1.16.1" },
- { name = "openhands-sdk", specifier = "==1.16.1" },
- { name = "openhands-tools", specifier = "==1.16.1" },
+ { name = "openhands-agent-server", specifier = "==1.17.0" },
+ { name = "openhands-sdk", specifier = "==1.17.0" },
+ { name = "openhands-tools", specifier = "==1.17.0" },
{ name = "opentelemetry-api", specifier = ">=1.33.1" },
{ name = "opentelemetry-exporter-otlp-proto-grpc", specifier = ">=1.33.1" },
{ name = "orjson", specifier = ">=3.11.6" },
@@ -3908,7 +3907,7 @@ test = [
[[package]]
name = "openhands-sdk"
-version = "1.16.1"
+version = "1.17.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "agent-client-protocol" },
@@ -3925,14 +3924,14 @@ dependencies = [
{ name = "tenacity" },
{ name = "websockets" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/53/b1/d1fd2a29e0c60e0277fb0191e8272873c7ff4e31f317f1edff1e02430309/openhands_sdk-1.16.1.tar.gz", hash = "sha256:12f203c3766800bdf5d9dd4dd0a7988b88e13ff4954b0c208903778111e29567", size = 352455, upload-time = "2026-04-02T15:21:52.378Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/0f/412842e12df7b061de515bddee0533fe82813023537bf2bfd3ba3cbac5e4/openhands_sdk-1.17.0.tar.gz", hash = "sha256:3c69df6590f023a514137272d413658848e0d5bc9aecf941b946c8662862779a", size = 378039, upload-time = "2026-04-13T19:04:39.792Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/ab/f9/c002ec8e9b8bf3b4967afc433409cdef62e356274f4ea4fdda87fe9ef805/openhands_sdk-1.16.1-py3-none-any.whl", hash = "sha256:0b487929e03e8c87ac6d99f37ff5314df3db6af70a06b516b0858327f9744f2b", size = 445227, upload-time = "2026-04-02T15:21:51.074Z" },
+ { url = "https://files.pythonhosted.org/packages/78/62/308c07997cddf6b465bd0352d583232eb55922e0fde529f432ccf81d0de6/openhands_sdk-1.17.0-py3-none-any.whl", hash = "sha256:3b771e72209453871c3036a562cf33e9ad9642a54bd48edb44f89915ac54709d", size = 475771, upload-time = "2026-04-13T19:04:41.056Z" },
]
[[package]]
name = "openhands-tools"
-version = "1.16.1"
+version = "1.17.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "bashlex" },
@@ -3945,9 +3944,9 @@ dependencies = [
{ name = "pydantic" },
{ name = "tom-swe" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/a3/63/8532589b14744196cf12c1d337b34b6c85f5b1e26eefc6b457570573fd28/openhands_tools-1.16.1.tar.gz", hash = "sha256:64488f2d7705ff90f4bfb7dfd1a2f1fbb4f379059d96e0073677c168d97135e7", size = 117133, upload-time = "2026-04-02T15:21:47.806Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/be/e6/e0aab57d2d80e2c826fafc40b489c6e36e58bac4b2371ed7ade3ff2a705f/openhands_tools-1.17.0.tar.gz", hash = "sha256:4a9d6c1aec00d366d0feb1ac2e9ee9988ad9806a0ef89f7dbe4655644e639d4a", size = 125332, upload-time = "2026-04-13T19:04:36.344Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/af/41/d78c1927eba7bfc0492a6d80c97c03d4f1e1aa6798ff5d47c21f4fda5048/openhands_tools-1.16.1-py3-none-any.whl", hash = "sha256:f7fd1eb205571d02ee480ad71e96cac0c34c57c0938c4074fe135a579a7538d7", size = 158190, upload-time = "2026-04-02T15:21:53.969Z" },
+ { url = "https://files.pythonhosted.org/packages/80/00/900dde3fc6402a9faf63c5c219e034d3ae6fab8b8d1af96361b67e858dbb/openhands_tools-1.17.0-py3-none-any.whl", hash = "sha256:76cd30fcc153627444f18638bcd926c9190989f80a3492381e84a181c021d815", size = 168194, upload-time = "2026-04-13T19:04:38.013Z" },
]
[[package]]