Merge branch 'main' into feat/configurable-health-check-timeout-1571

Author: ixchio

examples/01_standalone_sdk/46_agent_settings.py

@@ -1,7 +1,7 @@
-"""Create, serialize, and deserialize AgentSettings, then build a working agent.
+"""Create, serialize, and deserialize LLMAgentSettings, then build a working agent.
 
 Demonstrates:
-1. Configuring an agent entirely through AgentSettings (LLM, tools, condenser).
+1. Configuring an agent entirely through LLMAgentSettings (LLM, tools, condenser).
 2. Serializing settings to JSON and restoring them.
 3. Building an Agent from settings via ``create_agent()``.
 4. Running a short conversation to prove the settings take effect.
@@ -13,7 +13,7 @@
 
 from pydantic import SecretStr
 
-from openhands.sdk import LLM, AgentSettings, Conversation, Tool
+from openhands.sdk import LLM, Conversation, LLMAgentSettings, Tool
 from openhands.sdk.settings import CondenserSettings
 from openhands.tools.file_editor import FileEditorTool
 from openhands.tools.terminal import TerminalTool
@@ -23,7 +23,7 @@
 api_key = os.getenv("LLM_API_KEY")
 assert api_key is not None, "LLM_API_KEY environment variable is not set."
 
-settings = AgentSettings(
+settings = LLMAgentSettings(
     llm=LLM(
         model=os.getenv("LLM_MODEL", "anthropic/claude-sonnet-4-5-20250929"),
         api_key=SecretStr(api_key),
@@ -42,7 +42,7 @@
 print(json.dumps(payload, indent=2, default=str)[:800], "…")
 print()
 
-restored = AgentSettings.model_validate(payload)
+restored = LLMAgentSettings.model_validate(payload)
 assert restored.condenser.enabled is True
 assert restored.condenser.max_size == 50
 assert len(restored.tools) == 2
@@ -73,7 +73,7 @@
 
 # ── 4. Different settings → different behavior ───────────────────────────
 # Now create settings with ONLY the terminal tool and condenser disabled.
-terminal_only_settings = AgentSettings(
+terminal_only_settings = LLMAgentSettings(
     llm=settings.llm,
     tools=[Tool(name=TerminalTool.name)],
     condenser=CondenserSettings(enabled=False),

openhands-agent-server/openhands/agent_server/models.py

@@ -121,6 +121,13 @@ class _ConversationInfoBase(BaseModel):
         default_factory=list,
         description="List of activated knowledge skills name",
     )
+    invoked_skills: list[str] = Field(
+        default_factory=list,
+        description=(
+            "Names of progressive-disclosure skills explicitly invoked via the "
+            "`invoke_skill` tool."
+        ),
+    )
     blocked_actions: dict[str, str] = Field(
         default_factory=dict,
         description="Actions blocked by PreToolUse hooks, keyed by action ID",

openhands-agent-server/openhands/agent_server/settings_router.py

@@ -2,15 +2,24 @@
 
 from fastapi import APIRouter
 
-from openhands.sdk.settings import AgentSettings, ConversationSettings, SettingsSchema
+from openhands.sdk.settings import (
+    ConversationSettings,
+    SettingsSchema,
+    export_agent_settings_schema,
+)
 
 
 settings_router = APIRouter(prefix="/settings", tags=["Settings"])
 
 
 @lru_cache(maxsize=1)
 def _get_agent_settings_schema() -> SettingsSchema:
-    return AgentSettings.export_schema()
+    # ``AgentSettings`` is now a discriminated union over
+    # ``LLMAgentSettings`` and ``ACPAgentSettings``; the combined
+    # schema tags sections with a ``variant`` so the frontend can
+    # show LLM-only or ACP-only sections based on the active
+    # ``agent_kind`` value.
+    return export_agent_settings_schema()
 
 
 @lru_cache(maxsize=1)

openhands-sdk/openhands/sdk/__init__.py

@@ -45,15 +45,21 @@
 )
 from openhands.sdk.plugin import Plugin
 from openhands.sdk.settings import (
+    ACPAgentSettings,
     AgentSettings,
+    AgentSettingsConfig,
     CondenserSettings,
     ConversationSettings,
+    LLMAgentSettings,
     SettingsChoice,
     SettingsFieldSchema,
     SettingsSchema,
     SettingsSectionSchema,
     VerificationSettings,
+    default_agent_settings,
+    export_agent_settings_schema,
     export_settings_schema,
+    validate_agent_settings,
 )
 from openhands.sdk.settings.metadata import (
     SettingProminence,
@@ -140,7 +146,13 @@
     "CondenserSettings",
     "ConversationSettings",
     "VerificationSettings",
+    "ACPAgentSettings",
     "AgentSettings",
+    "AgentSettingsConfig",
+    "LLMAgentSettings",
+    "default_agent_settings",
+    "export_agent_settings_schema",
+    "validate_agent_settings",
     "SettingsChoice",
     "SettingProminence",
     "SettingsFieldMetadata",