OpenHands
diff --git a/‎openhands_cli/setup.py‎
Lines changed: 1 addition & 0 deletions b/‎openhands_cli/setup.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎openhands_cli/stores/agent_store.py‎
Lines changed: 61 additions & 1 deletion b/‎openhands_cli/stores/agent_store.py‎
Lines changed: 61 additions & 1 deletion
diff --git a/‎openhands_cli/stores/cli_settings.py‎
Lines changed: 1 addition & 0 deletions b/‎openhands_cli/stores/cli_settings.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎openhands_cli/tui/content/splash.py‎
Lines changed: 15 additions & 1 deletion b/‎openhands_cli/tui/content/splash.py‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎openhands_cli/tui/modals/settings/components/cli_settings_tab.py‎
Lines changed: 12 additions & 0 deletions b/‎openhands_cli/tui/modals/settings/components/cli_settings_tab.py‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎openhands_cli/tui/textual_app.py‎
Lines changed: 40 additions & 1 deletion b/‎openhands_cli/tui/textual_app.py‎
Lines changed: 40 additions & 1 deletion
diff --git a/‎openhands_cli/tui/textual_app.tcss‎
Lines changed: 7 additions & 0 deletions b/‎openhands_cli/tui/textual_app.tcss‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎openhands_cli/tui/utils/critic/__init__.py‎
Lines changed: 10 additions & 0 deletions b/‎openhands_cli/tui/utils/critic/__init__.py‎
Lines changed: 10 additions & 0 deletions
@@ -123,4 +123,5 @@ def setup_conversation(
     conversation.set_confirmation_policy(confirmation_policy)
 
     console.print(f"✓ Agent initialized with model: {agent.llm.model}", style="green")
+
     return conversation
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import os
+import re
 from typing import Any
 
 from prompt_toolkit import HTML, print_formatted_text
@@ -16,20 +17,65 @@
     LocalFileStore,
 )
 from openhands.sdk.context import load_project_skills
+from openhands.sdk.critic.base import CriticBase
+from openhands.sdk.critic.impl.api import APIBasedCritic
 from openhands.tools.preset.default import get_default_tools
 from openhands_cli.locations import (
     AGENT_SETTINGS_PATH,
     PERSISTENCE_DIR,
     WORK_DIR,
 )
 from openhands_cli.mcp.mcp_utils import list_enabled_servers
+from openhands_cli.stores.cli_settings import CliSettings
 from openhands_cli.utils import (
     get_llm_metadata,
     get_os_description,
     should_set_litellm_extra_body,
 )
 
 
+def get_default_critic(llm: LLM, *, enable_critic: bool = True) -> CriticBase | None:
+    """Auto-configure critic for All-Hands LLM proxy.
+
+    When the LLM base_url matches `llm-proxy.*.all-hands.dev`, returns an
+    APIBasedCritic configured with:
+    - server_url: {base_url}/vllm
+    - api_key: same as LLM
+    - model_name: "critic"
+
+    Returns None if base_url doesn't match, api_key is not set, or enable_critic
+    is False.
+
+    Args:
+        llm: The LLM configuration
+        enable_critic: Whether critic feature is enabled (from settings)
+    """
+    # Check if critic is enabled in settings
+    if not enable_critic:
+        return None
+
+    base_url = llm.base_url
+    api_key = llm.api_key
+    if base_url is None or api_key is None:
+        return None
+
+    # Match: llm-proxy.{env}.all-hands.dev (e.g., staging, prod, eval, app)
+    pattern = r"^https?://llm-proxy\.[^./]+\.all-hands\.dev"
+    if not re.match(pattern, base_url):
+        return None
+
+    try:
+        return APIBasedCritic(
+            server_url=f"{base_url.rstrip('/')}/vllm",
+            api_key=api_key,
+            model_name="critic",
+        )
+    except Exception:
+        # If critic creation fails, silently return None
+        # This allows the CLI to continue working without critic
+        return None
+
+
 DEFAULT_LLM_BASE_URL = "https://llm-proxy.app.all-hands.dev/"
 
 # Environment variable names for LLM configuration
@@ -249,6 +295,12 @@ def load(self, session_id: str | None = None) -> Agent | None:
                     )
                 condenser = LLMSummarizingCondenser(llm=condenser_llm)
 
+            # Auto-configure critic if applicable
+            cli_settings = CliSettings.load()
+            critic = get_default_critic(
+                updated_llm, enable_critic=cli_settings.enable_critic
+            )
+
             # Update tools and context
             agent = agent.model_copy(
                 update={
@@ -259,6 +311,7 @@ def load(self, session_id: str | None = None) -> Agent | None:
                     else {},
                     "agent_context": agent_context,
                     "condenser": condenser,
+                    "critic": critic,
                 }
             )
 
@@ -320,9 +373,16 @@ def create_and_save_from_settings(
             tools=get_default_tools(enable_browser=False),
             mcp_config={},
             condenser=condenser,
+            # Note: critic is NOT included here - it will be derived on-the-fly
         )
 
-        # Save the agent configuration
+        # Save the agent configuration (without critic)
         self.save(agent)
 
+        # Now add critic on-the-fly for the returned agent (not persisted)
+        cli_settings = CliSettings.load()
+        critic = get_default_critic(llm, enable_critic=cli_settings.enable_critic)
+        if critic is not None:
+            agent = agent.model_copy(update={"critic": critic})
+
         return agent
@@ -12,6 +12,7 @@ class CliSettings(BaseModel):
 
     default_cells_expanded: bool = True
     auto_open_plan_panel: bool = True
+    enable_critic: bool = True
 
     @classmethod
     def get_config_path(cls) -> Path:
 
@@ -39,12 +39,15 @@ def get_openhands_banner() -> str:
     return "\n".join(padded_lines)
 
 
-def get_splash_content(conversation_id: str, *, theme: Theme) -> dict:
+def get_splash_content(
+    conversation_id: str, *, theme: Theme, has_critic: bool = False
+) -> dict:
     """Get structured splash screen content for native Textual widgets.
 
     Args:
         conversation_id: Optional conversation ID to display
         theme: Theme to use for colors
+        has_critic: Whether the agent has a critic configured
     """
     # Use theme colors
     primary_color = theme.primary
@@ -74,6 +77,7 @@ def get_splash_content(conversation_id: str, *, theme: Theme) -> dict:
             ),
         ],
         "update_notice": None,
+        "critic_notice": None,
     }
 
     # Add update notification if needed
@@ -83,4 +87,14 @@ def get_splash_content(conversation_id: str, *, theme: Theme) -> dict:
             "Run 'uv tool upgrade openhands' to update"
         )
 
+    # Add critic notification if enabled
+    if has_critic:
+        content["critic_notice"] = (
+            f"\n[{primary_color}]Experimental Critic Feature Enabled[/]\n"
+            "[dim]We've detected you're using the OpenHands LLM provider. "
+            "An experimental critic feature is now active (free) to predict task "
+            "success. We will collect usage metrics and your feedback "
+            "for critic improvement. You can disable this in settings.[/dim]"
+        )
+
     return content
@@ -75,6 +75,16 @@ def compose(self) -> ComposeResult:
                 value=self.cli_settings.auto_open_plan_panel,
             )
 
+            yield SettingsSwitch(
+                label="Enable Critic (Experimental)",
+                description=(
+                    "When enabled and using OpenHands LLM provider, an experimental "
+                    "critic feature will predict task success and collect feedback. "
+                ),
+                switch_id="enable_critic_switch",
+                value=self.cli_settings.enable_critic,
+            )
+
     def get_cli_settings(self) -> CliSettings:
         """Get the current CLI settings from the form."""
         default_cells_expanded_switch = self.query_one(
@@ -83,8 +93,10 @@ def get_cli_settings(self) -> CliSettings:
         auto_open_plan_panel_switch = self.query_one(
             "#auto_open_plan_panel_switch", Switch
         )
+        enable_critic_switch = self.query_one("#enable_critic_switch", Switch)
 
         return CliSettings(
             default_cells_expanded=default_cells_expanded_switch.value,
             auto_open_plan_panel=auto_open_plan_panel_switch.value,
+            enable_critic=enable_critic_switch.value,
         )
@@ -180,6 +180,7 @@ def compose(self) -> ComposeResult:
                 )
                 yield Static(id="splash_instructions", classes="splash-instruction")
                 yield Static(id="splash_update_notice", classes="splash-update-notice")
+                yield Static(id="splash_critic_notice", classes="splash-critic-notice")
 
             # Input area - docked to bottom
             with Container(id="input_area"):
@@ -348,9 +349,24 @@ def _initialize_main_ui(self) -> None:
         if self.is_ui_initialized:
             return
 
+        # Check if agent has critic configured
+        has_critic = False
+        try:
+            from openhands_cli.stores import AgentStore
+
+            agent_store = AgentStore()
+            agent = agent_store.load()
+            if agent:
+                has_critic = agent.critic is not None
+        except Exception:
+            # If we can't load agent, just continue without critic notice
+            pass
+
         # Get structured splash content
         splash_content = get_splash_content(
-            conversation_id=self.conversation_id.hex, theme=OPENHANDS_THEME
+            conversation_id=self.conversation_id.hex,
+            theme=OPENHANDS_THEME,
+            has_critic=has_critic,
         )
 
         # Update individual splash widgets
@@ -376,6 +392,14 @@ def _initialize_main_ui(self) -> None:
         else:
             update_notice_widget.display = False
 
+        # Update critic notice (hide if None)
+        critic_notice_widget = self.query_one("#splash_critic_notice", Static)
+        if splash_content["critic_notice"]:
+            critic_notice_widget.update(splash_content["critic_notice"])
+            critic_notice_widget.display = True
+        else:
+            critic_notice_widget.display = False
+
         # Process any queued inputs
         self._process_queued_inputs()
         self.is_ui_initialized = True
@@ -489,6 +513,9 @@ def _handle_command(self, command: str) -> None:
 
     async def _handle_user_message(self, user_message: str) -> None:
         """Handle regular user messages with the conversation runner."""
+        # Dismiss any pending critic feedback widgets when user sends a new message
+        self._dismiss_pending_feedback_widgets()
+
         # Check if conversation runner is initialized
         if self.conversation_runner is None:
             self.conversation_runner = self.create_conversation_runner()
@@ -720,6 +747,18 @@ def _handle_feedback_command(self) -> None:
             severity="information",
         )
 
+    def _dismiss_pending_feedback_widgets(self) -> None:
+        """Remove all pending CriticFeedbackWidget instances from the UI.
+
+        Called when user sends a new message, indicating they chose to
+        ignore the feedback prompt.
+        """
+        from openhands_cli.tui.utils.critic.feedback import CriticFeedbackWidget
+
+        # Find and remove all CriticFeedbackWidget instances
+        for widget in self.main_display.query(CriticFeedbackWidget):
+            widget.remove()
+
     def _handle_new_command(self) -> None:
         """Handle the /new command to start a new conversation."""
         self._conversation_manager.create_new()
 
@@ -106,4 +106,11 @@ Footer {
     background: $background;
     color: $primary;
     margin: 1 0 0 0;
+}
+
+.splash-critic-notice {
+    padding: 0 1;
+    background: $background;
+    color: $foreground;
+    margin: 0;
 }
@@ -0,0 +1,10 @@
+"""Critic visualization utilities."""
+
+from openhands_cli.tui.utils.critic.feedback import send_critic_inference_event
+from openhands_cli.tui.utils.critic.visualization import create_critic_collapsible
+
+
+__all__ = [
+    "create_critic_collapsible",
+    "send_critic_inference_event",
+]