refactor(sdk): remove legacy verification shims

Co-authored-by: openhands <openhands@all-hands.dev>

Author: openhands-agent

AGENTS.md

@@ -107,7 +107,7 @@ When reviewing code, provide constructive feedback:
 - `AgentSettings.tools` is part of the exported settings schema so the schema stays aligned with the settings payload that round-trips through `AgentSettings` and drives `create_agent()`.
 - `AgentSettings.mcp_config` now uses FastMCP's typed `MCPConfig` at runtime. When serializing settings back to plain data (e.g. `model_dump()` or `create_agent()`), keep the output compact with `exclude_none=True, exclude_defaults=True` so callers still see the familiar `.mcp.json`-style dict shape.
 - Persisted `AgentSettings` now have an SDK-owned canonical migration contract: legacy v1 payloads are the raw unversioned settings mapping, while the current canonical format is v2 `{\"version\": 2, \"settings\": ...}`. Use `AgentSettings.load_persisted()`/`dump_persisted()` so consumers share the same upgrade path and preserve sparse overlays with `exclude_unset=True`.
-- `ConversationSettings` is now the canonical owner of conversation-scoped confirmation controls (`confirmation_mode`, `security_analyzer`). Keep `ConversationVerificationSettings` only as a compatibility shim for older payloads/API callers, and hide the legacy wrapper from exported settings schemas rather than reintroducing it into the agent schema.
+- `ConversationSettings` owns the conversation-scoped confirmation controls directly (`confirmation_mode`, `security_analyzer`); keep those fields top-level on the model and grouped into the exported `verification` section via schema metadata rather than nested helper models.
 - Anthropic malformed tool-use/tool-result history errors (for example, missing or duplicated ``tool_result`` blocks) are intentionally mapped to a dedicated `LLMMalformedConversationHistoryError` and caught separately in `Agent.step()`, so recovery can still use condensation while logs preserve that this was malformed history rather than a true context-window overflow.
 - AgentSkills progressive disclosure goes through `AgentContext.get_system_message_suffix()` into `<available_skills>`, and `openhands.sdk.context.skills.to_prompt()` truncates each prompt description to 1024 characters because the AgentSkills specification caps `description` at 1-1024 characters.
 - Workspace-wide uv resolver guardrails belong in the repository root `[tool.uv]` table. When `exclude-newer` is configured there, `uv lock` persists it into the root `uv.lock` `[options]` section as both an absolute cutoff and `exclude-newer-span`, and `uv sync --frozen` continues to use that locked workspace state.

openhands-sdk/openhands/sdk/__init__.py

@@ -53,7 +53,6 @@
     AgentSettings,
     CondenserSettings,
     ConversationSettings,
-    ConversationVerificationSettings,
     SettingsChoice,
     SettingsFieldSchema,
     SettingsSchema,
@@ -140,7 +139,6 @@
     "LLMSummarizingCondenser",
     "CondenserSettings",
     "ConversationSettings",
-    "ConversationVerificationSettings",
     "VerificationSettings",
     "AgentSettings",
     "SettingsChoice",

openhands-sdk/openhands/sdk/settings/__init__.py

@@ -17,7 +17,6 @@
         AgentSettings,
         CondenserSettings,
         ConversationSettings,
-        ConversationVerificationSettings,
         SettingsChoice,
         SettingsFieldSchema,
         SettingsSchema,
@@ -30,7 +29,6 @@
     "AgentSettings",
     "CondenserSettings",
     "ConversationSettings",
-    "ConversationVerificationSettings",
     "SettingsChoice",
     "SettingsFieldSchema",
     "SettingsSchema",
@@ -43,7 +41,6 @@
     "AgentSettings",
     "CondenserSettings",
     "ConversationSettings",
-    "ConversationVerificationSettings",
     "SETTINGS_METADATA_KEY",
     "SETTINGS_SECTION_METADATA_KEY",
     "SettingProminence",

openhands-sdk/openhands/sdk/settings/model.py

@@ -13,7 +13,6 @@
     SecretStr,
     field_serializer,
     field_validator,
-    model_validator,
 )
 from pydantic.fields import FieldInfo
 
@@ -199,61 +198,6 @@ class VerificationSettings(BaseModel):
         },
     )
 
-    # Keep these legacy fields on the public SDK model for backward compatibility,
-    # but hide them from the exported AgentSettings schema now that conversation-
-    # level verification lives on ConversationSettings.
-    _SCHEMA_EXCLUDED_FIELDS: ClassVar[frozenset[str]] = frozenset(
-        {"confirmation_mode", "security_analyzer"}
-    )
-
-    confirmation_mode: bool = Field(
-        default=False,
-        description="Require user confirmation before executing risky actions.",
-        json_schema_extra={
-            SETTINGS_METADATA_KEY: SettingsFieldMetadata(
-                label="Confirmation mode",
-                prominence=SettingProminence.MAJOR,
-            ).model_dump()
-        },
-    )
-    security_analyzer: SecurityAnalyzerType | None = Field(
-        default=None,
-        description="Security analyzer that evaluates actions before execution.",
-        json_schema_extra={
-            SETTINGS_METADATA_KEY: SettingsFieldMetadata(
-                label="Security analyzer",
-                prominence=SettingProminence.MAJOR,
-                depends_on=("confirmation_mode",),
-            ).model_dump()
-        },
-    )
-
-
-class ConversationVerificationSettings(BaseModel):
-    """Conversation-level confirmation and security settings."""
-
-    confirmation_mode: bool = Field(
-        default=False,
-        description="Require user confirmation before executing risky actions.",
-        json_schema_extra={
-            SETTINGS_METADATA_KEY: SettingsFieldMetadata(
-                label="Confirmation mode",
-                prominence=SettingProminence.MAJOR,
-            ).model_dump()
-        },
-    )
-    security_analyzer: SecurityAnalyzerType | None = Field(
-        default="llm",
-        description="Security analyzer that evaluates actions before execution.",
-        json_schema_extra={
-            SETTINGS_METADATA_KEY: SettingsFieldMetadata(
-                label="Security analyzer",
-                prominence=SettingProminence.MAJOR,
-                depends_on=("confirmation_mode",),
-            ).model_dump()
-        },
-    )
-
 
 def _default_llm_settings() -> LLM:
     model = LLM.model_fields["model"].get_default()
@@ -516,54 +460,6 @@ class ConversationSettings(BaseModel):
             ).model_dump(),
         },
     )
-    verification: ConversationVerificationSettings = Field(
-        default_factory=ConversationVerificationSettings,
-        description="Conversation confirmation and security settings.",
-        json_schema_extra={
-            SETTINGS_SECTION_METADATA_KEY: SettingsSectionMetadata(
-                key="verification",
-                label="Verification",
-            ).model_dump(),
-            "openhands_settings_schema_hidden": True,
-        },
-    )
-
-    @model_validator(mode="before")
-    @classmethod
-    def _flatten_verification_fields(cls, data: Any) -> Any:
-        if not isinstance(data, Mapping):
-            return data
-
-        normalized = dict(data)
-        verification = normalized.get("verification")
-        if isinstance(verification, BaseModel):
-            verification = verification.model_dump(mode="python")
-        if not isinstance(verification, Mapping):
-            return normalized
-
-        if (
-            "confirmation_mode" not in normalized
-            and "confirmation_mode" in verification
-        ):
-            normalized["confirmation_mode"] = deepcopy(
-                verification["confirmation_mode"]
-            )
-        if (
-            "security_analyzer" not in normalized
-            and "security_analyzer" in verification
-        ):
-            normalized["security_analyzer"] = deepcopy(
-                verification["security_analyzer"]
-            )
-        return normalized
-
-    @model_validator(mode="after")
-    def _sync_verification_compatibility_view(self) -> ConversationSettings:
-        self.verification = ConversationVerificationSettings(
-            confirmation_mode=self.confirmation_mode,
-            security_analyzer=self.security_analyzer,
-        )
-        return self
 
     @classmethod
     def export_schema(cls) -> SettingsSchema:
@@ -784,18 +680,10 @@ def settings_metadata(field: FieldInfo) -> SettingsFieldMetadata | None:
     return SettingsFieldMetadata.model_validate(metadata)
 
 
-_SETTINGS_SCHEMA_HIDDEN_KEY = "openhands_settings_schema_hidden"
 _GENERAL_SECTION_KEY = "general"
 _GENERAL_SECTION_LABEL = "General"
 
 
-def settings_schema_hidden(field: FieldInfo) -> bool:
-    extra = field.json_schema_extra
-    if not isinstance(extra, dict):
-        return False
-    return bool(extra.get(_SETTINGS_SCHEMA_HIDDEN_KEY, False))
-
-
 def export_settings_schema(model: type[BaseModel]) -> SettingsSchema:
     """Export a structured settings schema for a Pydantic settings model.
 
@@ -817,9 +705,6 @@ def ensure_section(key: str, label: str) -> SettingsSectionSchema:
         return section
 
     for field_name, field in model.model_fields.items():
-        if settings_schema_hidden(field):
-            continue
-
         section_metadata = settings_section_metadata(field)
         nested_model = _nested_model_type(field.annotation)
 
@@ -830,15 +715,8 @@ def ensure_section(key: str, label: str) -> SettingsSectionSchema:
                 section_metadata.key
             )
             section = ensure_section(section_metadata.key, section_label)
-            schema_excluded_fields = getattr(
-                nested_model, "_SCHEMA_EXCLUDED_FIELDS", frozenset()
-            )
             for nested_key, nested_field in nested_model.model_fields.items():
-                if (
-                    nested_field.exclude
-                    or nested_key in schema_excluded_fields
-                    or settings_schema_hidden(nested_field)
-                ):
+                if nested_field.exclude:
                     continue
                 metadata = settings_metadata(nested_field)
                 default_value = None
@@ -905,7 +783,7 @@ def ensure_section(key: str, label: str) -> SettingsSectionSchema:
         section = ensure_section(section_metadata.key, section_label)
         section.fields.append(
             SettingsFieldSchema(
-                key=f"{section_metadata.key}.{field_name}",
+                key=field_name,
                 label=(
                     metadata.label
                     if metadata.label is not None
@@ -917,12 +795,7 @@ def ensure_section(key: str, label: str) -> SettingsSectionSchema:
                 value_type=_infer_value_type(field.annotation),
                 default=_normalize_default(default_value),
                 prominence=metadata.prominence,
-                depends_on=[
-                    dependency
-                    if "." in dependency
-                    else f"{section_metadata.key}.{dependency}"
-                    for dependency in metadata.depends_on
-                ],
+                depends_on=list(metadata.depends_on),
                 secret=_contains_secret(field.annotation),
                 choices=_extract_choices(field.annotation),
             )

tests/agent_server/test_settings_router.py

@@ -23,8 +23,8 @@ def test_get_agent_settings_schema():
     )
     verification_field_keys = {field["key"] for field in verification_section["fields"]}
     assert "verification.critic_enabled" in verification_field_keys
-    assert "verification.confirmation_mode" not in verification_field_keys
-    assert "verification.security_analyzer" not in verification_field_keys
+    assert "confirmation_mode" not in verification_field_keys
+    assert "security_analyzer" not in verification_field_keys
 
 
 def test_get_conversation_settings_schema():
@@ -43,5 +43,5 @@ def test_get_conversation_settings_schema():
         section for section in body["sections"] if section["key"] == "verification"
     )
     verification_field_keys = {field["key"] for field in verification_section["fields"]}
-    assert "verification.confirmation_mode" in verification_field_keys
-    assert "verification.security_analyzer" in verification_field_keys
+    assert "confirmation_mode" in verification_field_keys
+    assert "security_analyzer" in verification_field_keys

tests/sdk/test_settings.py

@@ -14,11 +14,7 @@
 from openhands.sdk.critic.impl.api import APIBasedCritic
 from openhands.sdk.security.confirmation_policy import AlwaysConfirm, ConfirmRisky
 from openhands.sdk.security.llm_analyzer import LLMSecurityAnalyzer
-from openhands.sdk.settings import (
-    CondenserSettings,
-    ConversationVerificationSettings,
-    VerificationSettings,
-)
+from openhands.sdk.settings import CondenserSettings, VerificationSettings
 
 
 # Fields on LLM that have ``exclude=True`` and should not appear in the schema.
@@ -110,8 +106,8 @@ def test_agent_settings_export_schema_groups_sections() -> None:
     assert (
         v_fields["verification.critic_threshold"].prominence is SettingProminence.MINOR
     )
-    assert "verification.confirmation_mode" not in v_fields
-    assert "verification.security_analyzer" not in v_fields
+    assert "confirmation_mode" not in v_fields
+    assert "security_analyzer" not in v_fields
 
 
 def test_conversation_settings_export_schema_groups_sections() -> None:
@@ -130,65 +126,23 @@ def test_conversation_settings_export_schema_groups_sections() -> None:
     assert len(sections["verification"].fields) == 2
     verification_fields = {f.key: f for f in sections["verification"].fields}
     assert set(verification_fields) == {
-        "verification.confirmation_mode",
-        "verification.security_analyzer",
+        "confirmation_mode",
+        "security_analyzer",
     }
-    assert verification_fields["verification.confirmation_mode"].default is False
-    assert (
-        verification_fields["verification.confirmation_mode"].prominence
-        is SettingProminence.MAJOR
-    )
-    assert verification_fields["verification.security_analyzer"].default == "llm"
+    assert verification_fields["confirmation_mode"].default is False
     assert (
-        verification_fields["verification.security_analyzer"].choices[0].value == "llm"
+        verification_fields["confirmation_mode"].prominence is SettingProminence.MAJOR
     )
-    assert verification_fields["verification.security_analyzer"].depends_on == [
-        "verification.confirmation_mode"
-    ]
-
-
-def test_verification_settings_accepts_legacy_conversation_fields() -> None:
-    settings = VerificationSettings.model_validate(
-        {
-            "critic_enabled": True,
-            "confirmation_mode": True,
-            "security_analyzer": "none",
-        }
-    )
-
-    assert settings.critic_enabled is True
-    assert settings.confirmation_mode is True
-    assert settings.security_analyzer == "none"
-
-    dumped = settings.model_dump()
-    assert dumped["critic_enabled"] is True
-    assert dumped["confirmation_mode"] is True
-    assert dumped["security_analyzer"] == "none"
-
-
-def test_conversation_settings_flattens_verification_fields() -> None:
-    settings = ConversationSettings.model_validate(
-        {
-            "verification": {
-                "confirmation_mode": True,
-                "security_analyzer": "none",
-            }
-        }
-    )
-
-    assert settings.confirmation_mode is True
-    assert settings.security_analyzer == "none"
-    assert settings.verification.confirmation_mode is True
-    assert settings.verification.security_analyzer == "none"
+    assert verification_fields["security_analyzer"].default == "llm"
+    assert verification_fields["security_analyzer"].choices[0].value == "llm"
+    assert verification_fields["security_analyzer"].depends_on == ["confirmation_mode"]
 
 
 def test_conversation_settings_model_dump_roundtrip() -> None:
     settings = ConversationSettings(
         max_iterations=42,
-        verification=ConversationVerificationSettings(
-            confirmation_mode=True,
-            security_analyzer="none",
-        ),
+        confirmation_mode=True,
+        security_analyzer="none",
     )
 
     restored = ConversationSettings.model_validate(settings.model_dump(mode="json"))
@@ -199,10 +153,8 @@ def test_conversation_settings_model_dump_roundtrip() -> None:
 def test_conversation_settings_builds_runtime_helpers() -> None:
     settings = ConversationSettings(
         max_iterations=77,
-        verification=ConversationVerificationSettings(
-            confirmation_mode=True,
-            security_analyzer="llm",
-        ),
+        confirmation_mode=True,
+        security_analyzer="llm",
     )
 
     request_kwargs = settings.to_start_request_kwargs()
@@ -213,10 +165,8 @@ def test_conversation_settings_builds_runtime_helpers() -> None:
 
     fallback_settings = ConversationSettings(
         max_iterations=settings.max_iterations,
-        verification=ConversationVerificationSettings(
-            confirmation_mode=True,
-            security_analyzer="none",
-        ),
+        confirmation_mode=True,
+        security_analyzer="none",
     )
     fallback_request_kwargs = fallback_settings.to_start_request_kwargs()