Merge branch 'main' into vasco/goal-agent-server

Author: VascoSch92

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

@@ -21,7 +21,7 @@
     ConversationInfo,
     ConversationPage,
     ConversationSortOrder,
-    LaunchedProfile,
+    LaunchedAgentProfile,
     StartConversationRequest,
     StoredConversation,
     UpdateConversationRequest,
@@ -245,7 +245,7 @@ def _resolve_agent_from_profile(
     profile_id: "UUID",
     cipher: "Cipher | None",
     mcp_config: "Any",
-) -> "tuple[AgentBase, LaunchedProfile]":
+) -> "tuple[AgentBase, LaunchedAgentProfile]":
     """Load and resolve an agent profile by id, returning the built agent + provenance.
 
     Runs synchronously (call via ``asyncio.to_thread`` from async context).
@@ -290,7 +290,10 @@ def _resolve_agent_from_profile(
         raise ValueError(f"Profile '{profile_name}' failed to resolve: {exc}") from exc
 
     agent = settings_config.create_agent()
-    launched = LaunchedProfile(profile_id=profile.id, revision=profile.revision)
+    launched = LaunchedAgentProfile(
+        agent_profile_id=profile.id,
+        revision=profile.revision,
+    )
     return agent, launched
 
 
@@ -318,7 +321,7 @@ def _compose_conversation_info(
     # The ``acp_model`` fallback is gated on the agent NOT being a live,
     # initialized one. Once ``init_state`` has fired, ``current_model_id`` is the
     # authoritative resolved value — including ``None`` when an override couldn't
-    # be applied (unknown provider, or a resume whose ``set_session_model`` the
+    # be applied (unknown provider, or a resume whose model-selection call the
     # server rejected) — so falling back to ``acp_model`` there would re-assert an
     # override the live session isn't actually running. The fallback is only for
     # *cold* reads (``init_state`` hasn't fired, PrivateAttrs still empty), where
@@ -363,7 +366,7 @@ def _compose_conversation_info(
         available_models=available_models,
         supports_runtime_model_switch=supports_runtime_model_switch,
         client_tools=stored.client_tools,
-        launched_profile=stored.launched_profile,
+        launched_agent_profile=stored.launched_agent_profile,
     )
 
 
@@ -670,7 +673,7 @@ async def _start_conversation(
         # Profile resolution must happen before _prepare_request_workspace (which
         # asserts request.agent is not None) and before model_dump so the resolved
         # agent is captured in request_data.
-        launched_profile: LaunchedProfile | None = None
+        launched_agent_profile: LaunchedAgentProfile | None = None
         if request.agent_profile_id is not None:
             # get_settings_store() is safe here: get_instance() initialises the
             # singleton with the server cipher before any conversation can start.
@@ -681,7 +684,7 @@ async def _start_conversation(
 
             settings = get_settings_store().load() or PersistedSettings()
             mcp_config = settings.agent_settings.mcp_config
-            resolved_agent, launched_profile = await asyncio.to_thread(
+            resolved_agent, launched_agent_profile = await asyncio.to_thread(
                 _resolve_agent_from_profile,
                 request.agent_profile_id,
                 self.cipher,
@@ -751,7 +754,7 @@ async def _start_conversation(
         # serialize to plain strings. Pass expose_secrets=True so StaticSecret values
         # are preserved through the round-trip; the dict is only used in-process to
         # construct StoredConversation, not sent over the network.
-        # agent_profile_id is excluded: it was resolved into `launched_profile`
+        # agent_profile_id is excluded: it was resolved into `launched_agent_profile`
         # above and must not re-trigger the mutual-exclusivity validator.
         request_data = request.model_dump(
             mode="json",
@@ -772,9 +775,9 @@ async def _start_conversation(
                 {
                     "id": conversation_id,
                     **request_data,
-                    "launched_profile": (
-                        launched_profile.model_dump(mode="json")
-                        if launched_profile is not None
+                    "launched_agent_profile": (
+                        launched_agent_profile.model_dump(mode="json")
+                        if launched_agent_profile is not None
                         else None
                     ),
                 },
@@ -783,7 +786,7 @@ async def _start_conversation(
         else:
             stored = StoredConversation(
                 id=conversation_id,
-                launched_profile=launched_profile,
+                launched_agent_profile=launched_agent_profile,
                 **request_data,
             )
         event_service = await self._start_event_service(stored)

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

@@ -28,7 +28,9 @@
     TextContent as TextContent,
 )
 from openhands.sdk.llm.utils.metrics import MetricsSnapshot
-from openhands.sdk.profiles.agent_profile import LaunchedProfile as LaunchedProfile
+from openhands.sdk.profiles.agent_profile import (
+    LaunchedAgentProfile as LaunchedAgentProfile,
+)
 from openhands.sdk.secret import SecretSource
 from openhands.sdk.security.analyzer import SecurityAnalyzerBase
 from openhands.sdk.security.confirmation_policy import (
@@ -79,7 +81,7 @@ class StoredConversation(StartConversationRequest):
     Extends StartConversationRequest with server-assigned fields.
     """
 
-    # agent_profile_id is resolved into launched_profile at creation; exclude from
+    # agent_profile_id is resolved into launched_agent_profile at creation; exclude from
     # the persistence payload so it does not re-appear in meta.json.
     agent_profile_id: UUID | None = Field(default=None, exclude=True)
 
@@ -90,7 +92,7 @@ class StoredConversation(StartConversationRequest):
     metrics: MetricsSnapshot | None = None
     created_at: datetime = Field(default_factory=utc_now)
     updated_at: datetime = Field(default_factory=utc_now)
-    launched_profile: LaunchedProfile | None = Field(
+    launched_agent_profile: LaunchedAgentProfile | None = Field(
         default=None,
         description=(
             "Provenance snapshot of the agent profile that launched this "
@@ -237,25 +239,25 @@ class _ConversationInfoBase(BaseModel):
     supports_runtime_model_switch: bool = Field(
         default=False,
         description=(
-            "Whether a live, mid-conversation model switch (via "
-            "``session/set_model``) will be attempted for this conversation — "
+            "Whether a live, mid-conversation model switch will be attempted "
+            "for this conversation — "
             "tells the inline picker whether to offer a live-switch control. "
             "Mirrors the SDK's switch gate: ``True`` for known switch-capable "
-            "providers; ``True`` for unknown/custom ACP servers too, since "
-            "OpenHands attempts the switch optimistically rather than refusing "
-            "(a rejection then surfaces as an error). ``False`` for native "
+            "providers; ``False`` for unknown/custom ACP servers because their "
+            "generic config writes are not guaranteed live-switch primitives. "
+            "``False`` for native "
             "OpenHands agents, for a known provider that declares no support, "
             "and before the conversation has started a session."
         ),
     )
-    launched_profile: LaunchedProfile | None = Field(
+    launched_agent_profile: LaunchedAgentProfile | None = Field(
         default=None,
         description=(
             "Provenance snapshot of the agent profile that launched this "
             "conversation. Set at creation when the conversation was started via "
             "``agent_profile_id``; ``None`` for conversations started directly "
             "with ``agent`` or ``agent_settings``. Clients use this to identify "
-            "which profile is current without fragile settings-comparison."
+            "which agent profile is current without fragile settings-comparison."
         ),
     )
 

openhands-sdk/openhands/sdk/agent/acp_agent.py

@@ -400,6 +400,30 @@ def _write_secret_file(path: Path, value: str) -> None:
 # (codex-acp 0.16+, claude-agent-acp 0.44+) rather than the UNSTABLE ``models``
 # capability + ``session/set_model`` (gemini-cli, older codex/claude).
 _MODEL_CONFIG_OPTION_ID = "model"
+_CODEX_REASONING_EFFORTS: Final[frozenset[str]] = frozenset(
+    {"low", "medium", "high", "xhigh"}
+)
+
+
+def _codex_model_config_options(model: str) -> tuple[tuple[str, str], ...]:
+    """Map combined Canvas Codex model IDs to codex-acp config options."""
+    base_model, sep, effort = model.rpartition("/")
+    if sep and base_model and effort in _CODEX_REASONING_EFFORTS:
+        return (
+            (_MODEL_CONFIG_OPTION_ID, base_model),
+            ("reasoning_effort", effort),
+        )
+    return ((_MODEL_CONFIG_OPTION_ID, model),)
+
+
+def _model_config_options(
+    agent_name: str | None,
+    model: str,
+) -> tuple[tuple[str, str], ...]:
+    provider = detect_acp_provider_by_agent_name(agent_name or "")
+    if provider is not None and provider.key == "codex":
+        return _codex_model_config_options(model)
+    return ((_MODEL_CONFIG_OPTION_ID, model),)
 
 
 def _model_config_option(response: Any) -> Any | None:
@@ -432,19 +456,23 @@ async def _apply_acp_model(
     session_id: str,
     model: str,
     *,
+    agent_name: str | None = None,
     via_config_option: bool,
 ) -> None:
     """Apply ``model`` to a live ACP session via the mechanism the session
     advertised: ``set_config_option(configId="model")`` for configOptions-based
     servers (codex-acp 0.16+, claude-agent-acp 0.44+), else ``set_session_model``.
 
-    The model id is a bare preset id the server lists in its ``model`` select /
-    ``models`` capability — applied as-is on either mechanism.
+    The model id is normally the bare preset id listed by the server. For
+    Codex, callers may still pass a combined Canvas id such as ``gpt-5.5/high``;
+    codex-acp exposes reasoning effort as a separate config option, so split it
+    only on the config-options mechanism.
     """
     if via_config_option:
-        await conn.set_config_option(
-            config_id=_MODEL_CONFIG_OPTION_ID, value=model, session_id=session_id
-        )
+        for config_id, value in _model_config_options(agent_name, model):
+            await conn.set_config_option(
+                config_id=config_id, value=value, session_id=session_id
+            )
     else:
         await conn.set_session_model(model_id=model, session_id=session_id)
 
@@ -665,7 +693,11 @@ async def _maybe_set_session_model(
     # session won't accept degrades to the server default rather than failing.
     try:
         await _apply_acp_model(
-            conn, session_id, acp_model, via_config_option=via_config_option
+            conn,
+            session_id,
+            acp_model,
+            agent_name=agent_name,
+            via_config_option=via_config_option,
         )
         return True
     except ACPRequestError as e:
@@ -715,7 +747,11 @@ async def _reapply_session_model_on_resume(
         return False
     try:
         await _apply_acp_model(
-            conn, session_id, acp_model, via_config_option=via_config_option
+            conn,
+            session_id,
+            acp_model,
+            agent_name=agent_name,
+            via_config_option=via_config_option,
         )
         return True
     except ACPRequestError as e:
@@ -3751,6 +3787,7 @@ def set_acp_model(self, model: str) -> None:
                     self._conn,
                     self._session_id,
                     model,
+                    agent_name=self._agent_name,
                     via_config_option=self._model_via_config_option,
                 ),
                 timeout=self.acp_prompt_timeout,

openhands-sdk/openhands/sdk/profiles/__init__.py

@@ -5,7 +5,7 @@
     ACPAgentProfile,
     AgentProfile,
     AgentProfileBase,
-    LaunchedProfile,
+    LaunchedAgentProfile,
     OpenHandsAgentProfile,
     ProfileVerificationSettings,
     validate_agent_profile,
@@ -38,7 +38,7 @@
     "AgentProfileDiagnostics",
     "AgentProfileStore",
     "DanglingMcpServerRef",
-    "LaunchedProfile",
+    "LaunchedAgentProfile",
     "OpenHandsAgentProfile",
     "ProfileLimitExceeded",
     "ProfileNotFound",

openhands-sdk/openhands/sdk/profiles/agent_profile.py

@@ -209,20 +209,20 @@ class ACPAgentProfile(AgentProfileBase):
     )
 
 
-class LaunchedProfile(BaseModel):
-    """Provenance snapshot recorded when a profile launches a conversation.
+class LaunchedAgentProfile(BaseModel):
+    """Provenance snapshot recorded when an agent profile launches a conversation.
 
     Stored on ``StoredConversation`` and projected onto ``ConversationInfo`` so
-    ts-client ``deriveSwitchPlan`` can identify which profile is current without
-    fragile settings-comparison. See #3720.
+    ts-client ``deriveSwitchPlan`` can identify which agent profile is current
+    without fragile settings-comparison. See #3720.
     """
 
-    profile_id: UUID = Field(
-        description="Stable id of the profile that launched the conversation."
+    agent_profile_id: UUID = Field(
+        description="Stable id of the agent profile that launched the conversation.",
     )
     revision: int = Field(
         ge=0,
-        description="Revision of the profile at launch time.",
+        description="Revision of the agent profile at launch time.",
     )
 
 

openhands-sdk/pyproject.toml

@@ -5,7 +5,7 @@ description = "OpenHands SDK - Core functionality for building AI agents"
 
 requires-python = ">=3.12"
 dependencies = [
-    "agent-client-protocol>=0.8.1",
+    "agent-client-protocol>=0.10.1",
     "deprecation>=2.1.0",
     "fakeredis[lua]>=2.32.1",  # Explicit dependency for docket/fastmcp background tasks
     "fastmcp>=3.0.0",