Revert PR #2190: Enable ACPAgent on RemoteRuntime API (#2451)

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

Author: enyst

.github/workflows/run-eval.yml

@@ -97,18 +97,6 @@ on:
                     - gemini
                     - gpt5
                     - planning
-            agent_type:
-                description: >-
-                    Agent type: 'default' for standard Agent,
-                    'acp-claude' for ACPAgent with Claude Code,
-                    'acp-codex' for ACPAgent with Codex.
-                required: false
-                default: default
-                type: choice
-                options:
-                    - default
-                    - acp-claude
-                    - acp-codex
 
 
 env:
@@ -331,7 +319,6 @@ jobs:
                   ENABLE_CONVERSATION_EVENT_LOGGING: ${{ github.event.inputs.enable_conversation_event_logging || false }}
                   MAX_RETRIES: ${{ github.event.inputs.max_retries || '3' }}
                   TOOL_PRESET: ${{ github.event.inputs.tool_preset || 'default' }}
-                  AGENT_TYPE: ${{ github.event.inputs.agent_type || 'default' }}
                   TRIGGERED_BY: ${{ github.actor }}
               run: |
                   echo "Dispatching evaluation workflow with SDK commit: $SDK_SHA (benchmark: $BENCHMARK, eval branch: $EVAL_BRANCH, benchmarks branch: $BENCHMARKS_BRANCH, tool preset: $TOOL_PRESET)"
@@ -350,9 +337,8 @@ jobs:
                     --argjson enable_conversation_event_logging "$ENABLE_CONVERSATION_EVENT_LOGGING" \
                     --arg max_retries "$MAX_RETRIES" \
                     --arg tool_preset "$TOOL_PRESET" \
-                    --arg agent_type "$AGENT_TYPE" \
                     --arg triggered_by "$TRIGGERED_BY" \
-                    '{ref: $ref, inputs: {sdk_commit: $sdk, eval_limit: $eval_limit, models_json: ($models | tostring), trigger_reason: $reason, pr_number: $pr, benchmarks_branch: $benchmarks, benchmark: $benchmark, instance_ids: $instance_ids, num_infer_workers: $num_infer_workers, num_eval_workers: $num_eval_workers, enable_conversation_event_logging: $enable_conversation_event_logging, max_retries: $max_retries, tool_preset: $tool_preset, agent_type: $agent_type, triggered_by: $triggered_by}}')
+                    '{ref: $ref, inputs: {sdk_commit: $sdk, eval_limit: $eval_limit, models_json: ($models | tostring), trigger_reason: $reason, pr_number: $pr, benchmarks_branch: $benchmarks, benchmark: $benchmark, instance_ids: $instance_ids, num_infer_workers: $num_infer_workers, num_eval_workers: $num_eval_workers, enable_conversation_event_logging: $enable_conversation_event_logging, max_retries: $max_retries, tool_preset: $tool_preset, triggered_by: $triggered_by}}')
                   RESPONSE=$(curl -sS -o /tmp/dispatch.out -w "%{http_code}" -X POST \
                     -H "Authorization: token $PAT_TOKEN" \
                     -H "Accept: application/vnd.github+json" \

examples/01_standalone_sdk/40_acp_agent_example.py

@@ -7,7 +7,7 @@
 
 Prerequisites:
     - Node.js / npx available
-    - ANTHROPIC_BASE_URL and ANTHROPIC_API_KEY set (can point to LiteLLM proxy)
+    - Claude Code CLI authenticated (or CLAUDE_API_KEY set)
 
 Usage:
     uv run python examples/01_standalone_sdk/40_acp_agent_example.py
@@ -38,9 +38,6 @@
         "Based on what you just saw, which agent class is the newest addition?"
     )
     print(f"ask_agent response: {response}")
-    # Report cost (ACP server reports usage via session_update notifications)
-    cost = agent.llm.metrics.accumulated_cost
-    print(f"EXAMPLE_COST: {cost:.4f}")
 finally:
     # Clean up the ACP server subprocess
     agent.close()

examples/02_remote_agent_server/09_acp_agent_with_remote_runtime.py

@@ -38,9 +38,6 @@
 from openhands.agent_server.tool_router import tool_router
 from openhands.agent_server.vscode_router import vscode_router
 from openhands.agent_server.vscode_service import get_vscode_service
-from openhands.sdk.agent import (
-    ACPAgent,  # noqa: F401  — register in DiscriminatedUnionMixin
-)
 from openhands.sdk.logger import DEBUG, get_logger
 
 

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

@@ -85,22 +85,7 @@ RUN set -eux; \
     chown -R ${USERNAME}:${USERNAME} /workspace; \
     rm -rf /var/lib/apt/lists/*
 
-# Pre-install ACP servers for ACPAgent support (Claude Code + Codex)
-# Install Node.js/npm if not present (SWE-bench base images may lack them)
-RUN set -eux; \
-    if ! command -v npm >/dev/null 2>&1; then \
-        curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
-        apt-get install -y --no-install-recommends nodejs && \
-        rm -rf /var/lib/apt/lists/*; \
-    fi; \
-    npm install -g @zed-industries/claude-agent-acp @zed-industries/codex-acp
-
-# Configure Claude Code managed settings for headless operation:
-# Allow all tool permissions (no human in the loop to approve).
-RUN mkdir -p /etc/claude-code && \
-    echo '{"permissions":{"allow":["Edit","Read","Bash"]}}' > /etc/claude-code/managed-settings.json
-
-# NOTE: we should NOT include UV_PROJECT_ENVIRONMENT here,
+# NOTE: we should NOT include UV_PROJECT_ENVIRONMENT here, 
 # since the agent might use it to perform other work (e.g. tools that use Python)
 COPY --from=ghcr.io/astral-sh/uv /uv /uvx /bin/
 

openhands-agent-server/openhands/agent_server/docker/Dockerfile

@@ -11,7 +11,7 @@
     StoredConversation,
 )
 from openhands.agent_server.pub_sub import PubSub, Subscriber
-from openhands.sdk import LLM, AgentBase, Event, Message, get_logger
+from openhands.sdk import LLM, Agent, AgentBase, Event, Message, get_logger
 from openhands.sdk.conversation.impl.local_conversation import LocalConversation
 from openhands.sdk.conversation.secret_registry import SecretValue
 from openhands.sdk.conversation.state import (
@@ -429,8 +429,7 @@ async def start(self):
         workspace = self.stored.workspace
         assert isinstance(workspace, LocalWorkspace)
         Path(workspace.working_dir).mkdir(parents=True, exist_ok=True)
-        agent_cls = type(self.stored.agent)
-        agent = agent_cls.model_validate(
+        agent = Agent.model_validate(
             self.stored.agent.model_dump(context={"expose_secrets": True}),
         )