Revert "fix(sdk): simplify persisted AgentSettings migrations"

This restores the conversation settings split state for PR #2789.\n\nCo-authored-by: openhands <openhands@all-hands.dev>

Author: openhands-agent

AGENTS.md

@@ -107,8 +107,6 @@ 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`.
-- Keep the persisted-settings contract wrapper-based and product-neutral; do not fold persistence-only version metadata into the runtime `AgentSettings` model or add consumer-specific patch/diff helpers there.
-
 - 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-agent-server/openhands/agent_server/event_service.py

@@ -498,8 +498,8 @@ async def start(self):
             tags=self.stored.tags,
         )
 
-        # Set confirmation mode if enabled
         conversation.set_confirmation_policy(self.stored.confirmation_policy)
+        conversation.set_security_analyzer(self.stored.security_analyzer)
         self._conversation = conversation
 
         # Register state change callback to automatically publish updates

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

@@ -7,7 +7,14 @@
 from pydantic import BaseModel, Discriminator, Field, Tag, field_validator
 
 from openhands.agent_server.utils import OpenHandsUUID, utc_now
-from openhands.sdk import LLM, Agent, ImageContent, Message, TextContent
+from openhands.sdk import (
+    LLM,
+    Agent,
+    ConversationSettings,
+    ImageContent,
+    Message,
+    TextContent,
+)
 from openhands.sdk.agent.acp_agent import ACPAgent
 from openhands.sdk.conversation.conversation_stats import ConversationStats
 from openhands.sdk.conversation.secret_registry import SecretRegistry
@@ -105,6 +112,10 @@ class _StartConversationRequestBase(BaseModel):
         description="Controls when the conversation will prompt the user before "
         "continuing. Defaults to never.",
     )
+    security_analyzer: SecurityAnalyzerBase | None = Field(
+        default=None,
+        description="Optional security analyzer to evaluate action risks.",
+    )
     initial_message: SendMessageRequest | None = Field(
         default=None, description="Initial message to pass to the LLM"
     )
@@ -181,12 +192,42 @@ class StartConversationRequest(_StartConversationRequestBase):
 
     agent: Agent
 
+    @classmethod
+    def from_settings(
+        cls,
+        *,
+        agent: Agent,
+        workspace: LocalWorkspace,
+        conversation_settings: ConversationSettings | None = None,
+        **kwargs: Any,
+    ) -> "StartConversationRequest":
+        payload = dict(kwargs)
+        if conversation_settings is not None:
+            for key, value in conversation_settings.to_start_request_kwargs().items():
+                payload.setdefault(key, value)
+        return cls(agent=agent, workspace=workspace, **payload)
+
 
 class StartACPConversationRequest(_StartConversationRequestBase):
     """Payload to create a conversation with ACP-capable agent support."""
 
     agent: ACPEnabledAgent
 
+    @classmethod
+    def from_settings(
+        cls,
+        *,
+        agent: ACPEnabledAgent,
+        workspace: LocalWorkspace,
+        conversation_settings: ConversationSettings | None = None,
+        **kwargs: Any,
+    ) -> "StartACPConversationRequest":
+        payload = dict(kwargs)
+        if conversation_settings is not None:
+            for key, value in conversation_settings.to_start_request_kwargs().items():
+                payload.setdefault(key, value)
+        return cls(agent=agent, workspace=workspace, **payload)
+
 
 class StoredConversation(StartACPConversationRequest):
     """Stored details about a conversation.

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

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter
 
-from openhands.sdk.settings import AgentSettings, SettingsSchema
+from openhands.sdk.settings import AgentSettings, ConversationSettings, SettingsSchema
 
 
 settings_router = APIRouter(prefix="/settings", tags=["Settings"])
@@ -13,7 +13,18 @@ def _get_agent_settings_schema() -> SettingsSchema:
     return AgentSettings.export_schema()
 
 
+@lru_cache(maxsize=1)
+def _get_conversation_settings_schema() -> SettingsSchema:
+    return ConversationSettings.export_schema()
+
+
 @settings_router.get("/schema", response_model=SettingsSchema)
 async def get_agent_settings_schema() -> SettingsSchema:
     """Return the schema used to render AgentSettings-based settings forms."""
     return _get_agent_settings_schema()
+
+
+@settings_router.get("/conversation-schema", response_model=SettingsSchema)
+async def get_conversation_settings_schema() -> SettingsSchema:
+    """Return the schema used to render ConversationSettings-based forms."""
+    return _get_conversation_settings_schema()

openhands-sdk/openhands/sdk/__init__.py

@@ -52,6 +52,8 @@
 from openhands.sdk.settings import (
     AgentSettings,
     CondenserSettings,
+    ConversationSettings,
+    ConversationVerificationSettings,
     SettingsChoice,
     SettingsFieldSchema,
     SettingsSchema,
@@ -137,6 +139,8 @@
     "AgentContext",
     "LLMSummarizingCondenser",
     "CondenserSettings",
+    "ConversationSettings",
+    "ConversationVerificationSettings",
     "VerificationSettings",
     "AgentSettings",
     "SettingsChoice",

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

@@ -16,6 +16,8 @@
     from .model import (
         AgentSettings,
         CondenserSettings,
+        ConversationSettings,
+        ConversationVerificationSettings,
         SettingsChoice,
         SettingsFieldSchema,
         SettingsSchema,
@@ -27,6 +29,8 @@
 _MODEL_EXPORTS = {
     "AgentSettings",
     "CondenserSettings",
+    "ConversationSettings",
+    "ConversationVerificationSettings",
     "SettingsChoice",
     "SettingsFieldSchema",
     "SettingsSchema",
@@ -38,6 +42,8 @@
 __all__ = [
     "AgentSettings",
     "CondenserSettings",
+    "ConversationSettings",
+    "ConversationVerificationSettings",
     "SETTINGS_METADATA_KEY",
     "SETTINGS_SECTION_METADATA_KEY",
     "SettingProminence",