refactor(acp): inline vision probe into supports_vision()

Map values were all True and the helper's only caller was
ACPAgent.supports_vision(); drop the wrapper and check substring
membership inline. Replaces the provider→bool dict with a plain
tuple of known vision-capable ACP server markers.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Debug Agent

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

@@ -134,40 +134,21 @@ def _make_dummy_llm() -> LLM:
 }
 _DEFAULT_BYPASS_MODE = "full-access"
 
-# ACP server identifier substrings → whether the server forwards ACP
-# ImageContentBlock prompts to a vision-capable underlying model.
-#
-# Verified against upstream source (all declare prompt_capabilities.image=true
-# and map ContentBlock::Image to their provider's native image format):
-#   claude-agent-acp → Claude Sonnet/Opus/Haiku 3.5+ (vision)
+# ACP servers known to forward ImageContentBlock prompts to a vision-capable
+# underlying model. Verified against upstream source — all declare
+# prompt_capabilities.image=true and map ContentBlock::Image to their
+# provider's native image format:
+#   claude-agent-acp → Claude Sonnet/Opus/Haiku 3.5+
 #     src/acp-agent.ts: promptToClaude() case "image"
-#   gemini-cli       → Gemini 1.5/2.x Pro/Flash (vision)
+#   gemini-cli       → Gemini 1.5/2.x Pro/Flash
 #     packages/cli/src/acp/acpClient.ts: #resolvePrompt() case "image"
-#   codex-acp        → GPT-5 family via Codex CLI (vision)
+#   codex-acp        → GPT-5 family via Codex CLI
 #     src/thread.rs: build_prompt_items() image → UserInput::Image
-_ACP_VISION_PROVIDER_MARKERS: dict[str, bool] = {
-    "claude-agent-acp": True,
-    "gemini-cli": True,
-    "codex-acp": True,
-}
-
-
-def _acp_command_supports_vision(command: list[str], agent_name: str) -> bool:
-    """Return True if the ACP server forwards inline images to a vision model.
-
-    Matches on either the runtime agent name from InitializeResponse (when
-    available) or the configured launch command (always available). Falls
-    back to False for unknown servers so we do not silently send images a
-    server may drop.
-    """
-    haystacks: list[str] = []
-    if agent_name:
-        haystacks.append(agent_name.lower())
-    haystacks.append(" ".join(command).lower())
-    for marker, supports in _ACP_VISION_PROVIDER_MARKERS.items():
-        if any(marker in h for h in haystacks):
-            return supports
-    return False
+_VISION_CAPABLE_ACP_SERVERS: tuple[str, ...] = (
+    "claude-agent-acp",
+    "gemini-cli",
+    "codex-acp",
+)
 
 
 # ACP auth method ID → environment variable that supplies the credential.
@@ -815,9 +796,11 @@ def supports_vision(self) -> bool:
         does not recognise, so the base-class ``llm.vision_is_active()``
         always returns False for ACP agents. Resolve the real capability
         from the ACP server identity (launch command or the agent name
-        reported by InitializeResponse) instead.
+        reported by InitializeResponse) instead. Unknown servers fall back
+        to False so we don't silently send images a server may drop.
         """
-        return _acp_command_supports_vision(self.acp_command, self._agent_name)
+        probe = f"{self._agent_name} {' '.join(self.acp_command)}".lower()
+        return any(marker in probe for marker in _VISION_CAPABLE_ACP_SERVERS)
 
     def get_all_llms(self) -> Generator[LLM]:
         yield self.llm

tests/sdk/agent/test_acp_agent.py

@@ -13,7 +13,6 @@
 
 from openhands.sdk.agent.acp_agent import (
     ACPAgent,
-    _acp_command_supports_vision,
     _build_session_meta,
     _estimate_cost_from_tokens,
     _extract_token_usage,
@@ -2069,80 +2068,41 @@ def test_empty_name_defaults_to_full_access(self):
 
 
 # ---------------------------------------------------------------------------
-# _acp_command_supports_vision + ACPAgent.supports_vision()
+# ACPAgent.supports_vision()
 # ---------------------------------------------------------------------------
 
 
-class TestACPCommandSupportsVision:
+class TestACPAgentSupportsVision:
     """All three ACP providers OpenHands supports — claude-agent-acp,
     gemini-cli, codex-acp — declare prompt_capabilities.image=true and
     forward images to a vision-capable underlying model."""
 
-    def test_claude_agent_acp_command(self):
-        assert (
-            _acp_command_supports_vision(
-                ["npx", "-y", "@agentclientprotocol/claude-agent-acp"],
-                "",
-            )
-            is True
-        )
-
-    def test_claude_agent_acp_from_agent_name(self):
-        assert _acp_command_supports_vision(["/some/opaque/binary"], "claude-agent-acp")
-        assert _acp_command_supports_vision([], "claude-agent-acp")
-
-    def test_gemini_cli_command(self):
-        assert (
-            _acp_command_supports_vision(["gemini-cli", "--experimental-acp"], "")
-            is True
-        )
-
-    def test_gemini_cli_from_agent_name(self):
-        assert _acp_command_supports_vision(["node", "server.js"], "gemini-cli")
-
-    def test_codex_acp_command(self):
-        assert _acp_command_supports_vision(["codex-acp"], "") is True
-
-    def test_codex_acp_from_agent_name(self):
-        assert _acp_command_supports_vision([], "codex-acp")
-
-    def test_agent_name_takes_precedence_over_generic_command(self):
-        # A user can launch any of our three servers via ``node`` or a
-        # local path; the agent name from InitializeResponse still lets
-        # us identify the provider.
-        assert (
-            _acp_command_supports_vision(
-                ["/usr/local/bin/node", "/opt/server.js"],
-                "claude-agent-acp",
-            )
-            is True
-        )
-
-    def test_unknown_server_defaults_to_false(self):
-        # Safe default: unknown servers may silently drop image blocks,
-        # so advertise no-vision rather than send content that gets lost.
-        assert _acp_command_supports_vision(["some-random-acp-server"], "") is False
-
-    def test_empty_inputs_default_to_false(self):
-        assert _acp_command_supports_vision([], "") is False
-
-
-class TestACPAgentSupportsVision:
-    def test_claude_agent_supports_vision(self):
+    def test_claude_agent_via_command(self):
         agent = ACPAgent(
             acp_command=["npx", "-y", "@agentclientprotocol/claude-agent-acp"]
         )
         assert agent.supports_vision() is True
 
-    def test_gemini_cli_supports_vision(self):
+    def test_gemini_cli_via_command(self):
         agent = ACPAgent(acp_command=["gemini-cli", "--experimental-acp"])
         assert agent.supports_vision() is True
 
-    def test_codex_acp_supports_vision(self):
+    def test_codex_acp_via_command(self):
         agent = ACPAgent(acp_command=["codex-acp"])
         assert agent.supports_vision() is True
 
-    def test_unknown_acp_server_does_not_claim_vision(self):
+    def test_agent_name_resolves_opaque_launcher(self):
+        # A user can launch any of our three servers via ``node`` or a
+        # local path; the agent name from InitializeResponse still lets
+        # us identify the provider.
+        agent = ACPAgent(acp_command=["/usr/local/bin/node", "/opt/server.js"])
+        assert agent.supports_vision() is False
+        agent._agent_name = "claude-agent-acp"
+        assert agent.supports_vision() is True
+
+    def test_unknown_acp_server_defaults_to_false(self):
+        # Unknown servers may silently drop image blocks, so advertise
+        # no-vision rather than send content that gets lost.
         agent = ACPAgent(acp_command=["echo", "test"])
         assert agent.supports_vision() is False