glaip-sdk 0.7.12__py3-none-any.whl → 0.7.14__py3-none-any.whl

glaip_sdk/agents/base.py

@@ -54,10 +54,13 @@ from glaip_sdk.utils.resource_refs import is_uuid
 
 if TYPE_CHECKING:
     from glaip_sdk.client.schedules import AgentScheduleManager
+    from glaip_sdk.models import AgentResponse, Model
     from glaip_sdk.guardrails import GuardrailManager
-    from glaip_sdk.models import AgentResponse
     from glaip_sdk.registry import AgentRegistry, MCPRegistry, ToolRegistry
 
+# Import model validation utility
+from glaip_sdk.models._validation import _validate_model
+
 logger = logging.getLogger(__name__)
 
 _AGENT_NOT_DEPLOYED_MSG = "Agent must be deployed before running. Call deploy() first."
@@ -99,11 +102,11 @@ class Agent:
         - instruction: Agent instruction text (required)
         - description: Agent description (default: "")
         - tools: List of tools (default: [])
+        - model: Optional model override (default: None)
         - agents: List of sub-agents (default: [])
         - mcps: List of MCPs (default: [])
         - timeout: Timeout in seconds (default: 300)
         - metadata: Optional metadata dict (default: None)
-        - model: Optional model override (default: None)
         - framework: Agent framework (default: "langchain")
         - version: Agent version (default: "1.0.0")
         - agent_type: Agent type (default: "config")
@@ -130,7 +133,7 @@ class Agent:
         tools: list | None = None,
         agents: list | None = None,
         mcps: list | None = None,
-        model: str | None = _UNSET,  # type: ignore[assignment]
+        model: str | Model | None = _UNSET,  # type: ignore[assignment]
         guardrail: GuardrailManager | None = None,
         _client: Any = None,
         **kwargs: Any,
@@ -148,7 +151,7 @@ class Agent:
             tools: List of tools (Tool classes, SDK Tool objects, or strings).
             agents: List of sub-agents (Agent classes, instances, or strings).
             mcps: List of MCPs.
-            model: Model identifier.
+            model: Model identifier or Model configuration object.
             guardrail: The guardrail manager for content safety.
             _client: Internal client reference (set automatically).
 
@@ -176,7 +179,7 @@ class Agent:
         self._tools = tools
         self._agents = agents
         self._mcps = mcps
-        self._model = model
+        self._model = self._validate_and_set_model(model)
         self._guardrail = guardrail
         self._language_model_id: str | None = None
         # Extract parameters from kwargs with _UNSET defaults
@@ -185,6 +188,18 @@ class Agent:
         self._framework = kwargs.pop("framework", Agent._UNSET)  # type: ignore[assignment]
         self._version = kwargs.pop("version", Agent._UNSET)  # type: ignore[assignment]
         self._agent_type = kwargs.pop("agent_type", Agent._UNSET)  # type: ignore[assignment]
+
+        # Handle 'type' as a legacy alias for 'agent_type'
+        legacy_type = kwargs.pop("type", Agent._UNSET)
+        if legacy_type is not Agent._UNSET:
+            warnings.warn(
+                "The 'type' parameter is deprecated and will be removed in a future version. Use 'agent_type' instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            if self._agent_type is Agent._UNSET:
+                self._agent_type = legacy_type
+
         self._agent_config = kwargs.pop("agent_config", Agent._UNSET)  # type: ignore[assignment]
         self._tool_configs = kwargs.pop("tool_configs", Agent._UNSET)  # type: ignore[assignment]
         self._mcp_configs = kwargs.pop("mcp_configs", Agent._UNSET)  # type: ignore[assignment]
@@ -198,6 +213,30 @@ class Agent:
                 stacklevel=2,
             )
 
+    def _validate_and_set_model(self, model: str | Any) -> str | Any:
+        """Validate and normalize model parameter.
+
+        Supports both string model identifiers and Model objects:
+        - String: Simple model identifier (e.g., "openai/gpt-4o" or OpenAI.GPT_4O)
+        - Model: Model object with credentials/hyperparameters for local execution
+
+        Args:
+            model: Model identifier (string) or Model object.
+
+        Returns:
+            Validated model (string or Model object).
+        """
+        if model is None or model is Agent._UNSET:
+            return model
+
+        from glaip_sdk.models import Model  # noqa: PLC0415
+
+        if isinstance(model, str):
+            return _validate_model(model)
+        elif isinstance(model, Model):
+            return model
+        return model
+
     # ─────────────────────────────────────────────────────────────────
     # Properties (override in subclasses OR pass to __init__)
     # ─────────────────────────────────────────────────────────────────
@@ -342,11 +381,11 @@ class Agent:
         return None
 
     @property
-    def model(self) -> str | None:
+    def model(self) -> str | Model | None:
         """Optional model override.
 
         Returns:
-            Model identifier string or None to use default.
+            Model identifier string, Model object, or None to use default.
         """
         if self._model is not self._UNSET:
             return self._model
@@ -549,9 +588,14 @@ class Agent:
             "framework": self.framework,
             "version": self.version,
             "agent_type": self.agent_type,
-            "model": self.model,
         }
 
+        if self.model:
+            if isinstance(self.model, str):
+                config["model"] = self.model
+            else:
+                config["model"] = self.model.id
+
         # Handle metadata (default to empty dict if None)
         config["metadata"] = self.metadata or {}
 
@@ -848,21 +892,42 @@ class Agent:
         """Return a dict representation of the Agent.
 
         Provides Pydantic-style serialization for backward compatibility.
+        This implementation avoids triggering external tool resolution to ensure
+        it remains robust even when the environment is not fully configured.
 
         Args:
             exclude_none: If True, exclude None values from the output.
 
         Returns:
-            Dictionary containing Agent attributes.
+            Dictionary containing Agent attributes. Note: Mutable fields (dicts, lists)
+            are returned as references. Modify with caution or make a deep copy if needed.
         """
-        config = self._build_config(get_tool_registry(), get_mcp_registry())
+        # Map convenience timeout to agent_config if not already present
+        agent_config = self.agent_config if self.agent_config is not self._UNSET else {}
+        agent_config = dict(agent_config) if agent_config else {}
+
+        if self.timeout and "execution_timeout" not in agent_config:
+            agent_config["execution_timeout"] = self.timeout
+
+        # Handle guardrail serialization without full config build
+        if self.guardrail:
+            try:
+                from glaip_sdk.guardrails.serializer import (  # noqa: PLC0415
+                    serialize_guardrail_manager,
+                )
+
+                agent_config["guardrails"] = serialize_guardrail_manager(self.guardrail)
+            except ImportError:  # pragma: no cover
+                # Serializer not available (optional dependency); skip guardrail data
+                pass
 
         data = {
             "id": self._id,
             "name": self.name,
             "instruction": self.instruction,
             "description": self.description,
-            "type": self.agent_type,
+            "agent_type": self.agent_type,
+            "type": self.agent_type,  # Legacy key for backward compatibility
             "framework": self.framework,
             "version": self.version,
             "tools": self.tools,
@@ -870,7 +935,8 @@ class Agent:
             "mcps": self.mcps,
             "timeout": self.timeout,
             "metadata": self.metadata,
-            "agent_config": config.get("agent_config"),
+            "model": self.model,
+            "agent_config": agent_config,
             "tool_configs": self.tool_configs,
             "mcp_configs": self.mcp_configs,
             "a2a_profile": self.a2a_profile,
@@ -878,6 +944,7 @@ class Agent:
             "created_at": self._created_at,
             "updated_at": self._updated_at,
         }
+
         if exclude_none:
             return {k: v for k, v in data.items() if v is not None}
         return data

glaip_sdk/cli/commands/agents/__init__.py

@@ -11,37 +11,30 @@ Authors:
 # Import from submodules
 from glaip_sdk.cli.commands.agents._common import (  # noqa: E402
     AGENT_NOT_FOUND_ERROR,
-    _get_agent_for_update,
-    _resolve_agent,
-    agents_group,
     _coerce_mapping_candidate,
     _display_agent_details,
     _emit_verbose_guidance,
     _fetch_full_agent_details,
+    _get_agent_for_update,
     _get_agent_model_name,
     _get_language_model_display_name,
     _model_from_config,
     _prepare_agent_output,
+    _resolve_agent,
     _resolve_resources_by_name,
+    agents_group,
     console,
 )
 from glaip_sdk.cli.commands.agents.create import create  # noqa: E402
 from glaip_sdk.cli.commands.agents.delete import delete  # noqa: E402
 from glaip_sdk.cli.commands.agents.get import get  # noqa: E402
 from glaip_sdk.cli.commands.agents.list import list_agents  # noqa: E402
-from glaip_sdk.cli.commands.agents.run import run, _maybe_attach_transcript_toggle  # noqa: E402
+from glaip_sdk.cli.commands.agents.run import _maybe_attach_transcript_toggle, run  # noqa: E402
 from glaip_sdk.cli.commands.agents.sync_langflow import sync_langflow  # noqa: E402
 from glaip_sdk.cli.commands.agents.update import update  # noqa: E402
 
 # Import core functions for test compatibility
 from glaip_sdk.cli.core.context import get_client  # noqa: E402
-from glaip_sdk.cli.core.rendering import with_client_and_spinner  # noqa: E402
-
-# Import display functions for test compatibility
-from glaip_sdk.cli.display import (  # noqa: E402
-    handle_json_output,
-    handle_rich_output,
-)
 
 # Import core output functions for test compatibility
 from glaip_sdk.cli.core.output import (  # noqa: E402
@@ -52,11 +45,20 @@ from glaip_sdk.cli.core.output import (  # noqa: E402
 # Import rendering functions for test compatibility
 from glaip_sdk.cli.core.rendering import (  # noqa: E402
     build_renderer,
+    with_client_and_spinner,  # noqa: E402
 )
 
 # Import display functions for test compatibility
-from glaip_sdk.cli.display import (  # noqa: E402
+# Import display functions for test compatibility
+from glaip_sdk.cli.display import (  # noqa: E402  # noqa: E402
     display_agent_run_suggestions,
+    handle_json_output,
+    handle_rich_output,
+)
+
+# Import IO functions for test compatibility
+from glaip_sdk.cli.io import (  # noqa: E402
+    fetch_raw_resource_details,
 )
 
 # Import rich helpers for test compatibility
@@ -70,11 +72,6 @@ from glaip_sdk.cli.transcript import (  # noqa: E402
     store_transcript_for_session,
 )
 
-# Import IO functions for test compatibility
-from glaip_sdk.cli.io import (  # noqa: E402
-    fetch_raw_resource_details,
-)
-
 # Import utils for test compatibility
 from glaip_sdk.utils import (  # noqa: E402
     is_uuid,

glaip_sdk/cli/commands/agents/_common.py

@@ -19,8 +19,11 @@ from glaip_sdk.branding import (
     WARNING_STYLE,
 )
 from glaip_sdk.cli.constants import DEFAULT_AGENT_INSTRUCTION_PREVIEW_LIMIT
-from glaip_sdk.config.constants import AGENT_CONFIG_FIELDS, DEFAULT_MODEL
 from glaip_sdk.cli.context import get_ctx_value
+from glaip_sdk.cli.core.output import (
+    output_result,
+)
+from glaip_sdk.cli.core.rendering import spinner_context
 from glaip_sdk.cli.display import (
     build_resource_result_data,
     handle_json_output,
@@ -31,10 +34,8 @@ from glaip_sdk.cli.hints import in_slash_mode
 from glaip_sdk.cli.io import fetch_raw_resource_details
 from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.rich_helpers import markup_text
-from glaip_sdk.cli.core.output import (
-    output_result,
-)
-from glaip_sdk.cli.core.rendering import spinner_context
+from glaip_sdk.config.constants import AGENT_CONFIG_FIELDS
+from glaip_sdk.models.constants import DEFAULT_MODEL
 from glaip_sdk.icons import ICON_AGENT
 from glaip_sdk.utils import format_datetime, is_uuid
 

glaip_sdk/cli/commands/agents/create.py

@@ -11,19 +11,19 @@ from typing import Any
 import click
 
 from glaip_sdk.cli.context import output_flags
+from glaip_sdk.cli.core.context import get_client
 from glaip_sdk.cli.display import (
     display_agent_run_suggestions,
     display_creation_success,
     handle_json_output,
     handle_rich_output,
 )
-from glaip_sdk.cli.core.context import get_client
-from glaip_sdk.config.constants import DEFAULT_AGENT_RUN_TIMEOUT, DEFAULT_MODEL
 from glaip_sdk.cli.validators import (
     validate_agent_instruction_cli as validate_agent_instruction,
-    validate_agent_name_cli as validate_agent_name,
-    validate_timeout_cli as validate_timeout,
 )
+from glaip_sdk.cli.validators import validate_agent_name_cli as validate_agent_name
+from glaip_sdk.cli.validators import validate_timeout_cli as validate_timeout
+from glaip_sdk.config.constants import DEFAULT_AGENT_RUN_TIMEOUT
 from glaip_sdk.utils.validation import coerce_timeout
 
 from ._common import (
@@ -67,7 +67,11 @@ def _handle_creation_exception(ctx: Any, e: Exception) -> None:
 @click.option("--instruction", help="Agent instruction (prompt)")
 @click.option(
     "--model",
-    help=f"Language model to use (e.g., {DEFAULT_MODEL}, default: {DEFAULT_MODEL})",
+    help=(
+        "Language model in 'provider/model' format "
+        "(e.g., openai/gpt-4o-mini, bedrock/us.anthropic.claude-sonnet-4-20250514-v1:0). "
+        "Use 'aip models list' to see available models."
+    ),
 )
 @click.option("--tools", multiple=True, help="Tool names or IDs to attach")
 @click.option("--agents", multiple=True, help="Sub-agent names or IDs to attach")

glaip_sdk/cli/slash/tui/accounts.tcss

@@ -53,6 +53,10 @@ Screen {
     margin-left: 1;
 }
 
+Button:hover {
+    background: $surface-lighten-1;
+}
+
 #accounts-table {
     padding: 0 1 0 1;
     margin: 0 0 0 0;
@@ -60,6 +64,14 @@ Screen {
     border: tall $primary;
 }
 
+#accounts-table > .datatable--row:hover {
+    background: $surface-lighten-1;
+}
+
+.sidebar-block:hover {
+    background: $surface-lighten-1;
+}
+
 #status-bar {
     height: 3;
     padding: 0 1;

glaip_sdk/cli/slash/tui/accounts_app.py

@@ -37,11 +37,19 @@ from glaip_sdk.cli.slash.tui.terminal import TerminalCapabilities
 from glaip_sdk.cli.slash.tui.theme.catalog import _BUILTIN_THEMES
 
 try:  # pragma: no cover - optional dependency
-    from glaip_sdk.cli.slash.tui.toast import ClipboardToastMixin, Toast, ToastBus, ToastHandlerMixin, ToastVariant
+    from glaip_sdk.cli.slash.tui.toast import (
+        ClipboardToastMixin,
+        Toast,
+        ToastBus,
+        ToastContainer,
+        ToastHandlerMixin,
+        ToastVariant,
+    )
 except Exception:  # pragma: no cover - optional dependency
     ClipboardToastMixin = object  # type: ignore[assignment, misc]
     Toast = None  # type: ignore[assignment]
     ToastBus = None  # type: ignore[assignment]
+    ToastContainer = None  # type: ignore[assignment]
     ToastHandlerMixin = object  # type: ignore[assignment, misc]
     ToastVariant = None  # type: ignore[assignment]
 from glaip_sdk.cli.validators import validate_api_key
@@ -51,7 +59,8 @@ try:  # pragma: no cover - optional dependency
     from textual import events
     from textual.app import App, ComposeResult
     from textual.binding import Binding
-    from textual.containers import Container, Horizontal, Vertical
+    from textual.containers import Horizontal, Vertical
+    from textual.coordinate import Coordinate
     from textual.screen import ModalScreen
     from textual.suggester import SuggestFromList
     from textual.widgets import Button, Checkbox, DataTable, Footer, Header, Input, LoadingIndicator, Static
@@ -60,9 +69,9 @@ except Exception:  # pragma: no cover - optional dependency
     App = None  # type: ignore[assignment]
     ComposeResult = None  # type: ignore[assignment]
     Binding = None  # type: ignore[assignment]
-    Container = None  # type: ignore[assignment]
     Horizontal = None  # type: ignore[assignment]
     Vertical = None  # type: ignore[assignment]
+    Coordinate = None  # type: ignore[assignment]
     Button = None  # type: ignore[assignment]
     Checkbox = None  # type: ignore[assignment]
     DataTable = None  # type: ignore[assignment]
@@ -527,7 +536,7 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
 
     def compose(self) -> ComposeResult:  # type: ignore[return]
         """Compose the Harlequin layout with account list and detail panes."""
-        if not TEXTUAL_SUPPORTED or Horizontal is None or Vertical is None or Container is None:
+        if not TEXTUAL_SUPPORTED or Horizontal is None or Vertical is None or Static is None:
             return  # type: ignore[return-value]
 
         # Main container with horizontal split (25/75)
@@ -561,8 +570,8 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
                 )
 
         # Toast container for notifications
-        if Toast is not None:
-            yield Container(Toast(), id="toast-container")
+        if Toast is not None and ToastContainer is not None:
+            yield ToastContainer(Toast(), id="toast-container")
 
     def on_mount(self) -> None:
         """Configure the screen after mount."""
@@ -833,6 +842,21 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
         if not self._is_switching:
             self.action_switch_account()
 
+    def on_data_table_cell_selected(self, event: DataTable.CellSelected) -> None:  # type: ignore[override]
+        """Handle mouse click selection by triggering switch."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+        try:
+            table.cursor_coordinate = (event.coordinate.row, 0)
+        except Exception:
+            return
+        filtered = self._filtered_rows()
+        if event.coordinate.row < len(filtered):
+            self._update_selected_account(filtered[event.coordinate.row])
+        if not self._is_switching:
+            self.action_switch_account()
+
     def on_data_table_cursor_row_changed(self, event: DataTable.CursorRowChanged) -> None:  # type: ignore[override]
         """Handle cursor movement in the accounts list."""
         if not TEXTUAL_SUPPORTED:
@@ -875,6 +899,8 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
         """Open edit account modal."""
         if self._check_env_lock():
             return
+        # Get account from cursor position if not explicitly selected
+        self._ensure_account_selected_from_cursor()
         name = self._get_selected_name()
         if not name:
             self._set_status("Select an account to edit.", "yellow")
@@ -897,6 +923,8 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
         """Open delete confirmation modal."""
         if self._check_env_lock():
             return
+        # Get account from cursor position if not explicitly selected
+        self._ensure_account_selected_from_cursor()
         name = self._get_selected_name()
         if not name:
             self._set_status("Select an account to delete.", "yellow")
@@ -987,7 +1015,7 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
         if output is None:
             return None
 
-        def _write(sequence: str, _output=output) -> None:
+        def _write(sequence: str, _output: Any = output) -> None:
             _output.write(sequence)
             _output.flush()
 
@@ -1310,20 +1338,33 @@ class AccountsTextualApp(  # pragma: no cover - interactive
         self._queue_switch(name)
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:  # type: ignore[override]
-        """Handle mouse click selection by triggering switch.
+        """Handle row selection by triggering switch."""
+        self._handle_table_click(self._event_row(event))
 
-        Note: This handler is for the old table layout. When using HarlequinScreen,
-        the screen handles row selection directly. This handler gracefully skips
-        if the old table doesn't exist.
-        """
+    def on_data_table_cell_selected(self, event: DataTable.CellSelected) -> None:  # type: ignore[override]
+        """Handle mouse click selection by triggering switch."""
+        self._handle_table_click(self._event_row(event))
+
+    def _event_row(self, event: object) -> int | None:
+        """Extract the row index from a DataTable event."""
+        row = getattr(event, "cursor_row", None)
+        if row is not None:
+            return int(row)
+        coordinate = getattr(event, "coordinate", None)
+        return getattr(coordinate, "row", None) if coordinate is not None else None
+
+    def _handle_table_click(self, row: int | None) -> None:
+        """Move the cursor to a clicked row and trigger the switch action."""
+        if row is None:
+            return
         try:
             table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
         except Exception:
-            # Harlequin screen is active, let it handle the event
+            # Harlequin screen is active, let it handle the action
             return
         try:
             # Move cursor to clicked row then switch
-            table.cursor_coordinate = (event.cursor_row, 0)
+            table.cursor_coordinate = Coordinate(row, 0)
         except Exception:
             return
         self.action_switch_row()
@@ -1654,7 +1695,7 @@ class AccountsTextualApp(  # pragma: no cover - interactive
         if output is None:
             return None
 
-        def _write(sequence: str, _output=output) -> None:
+        def _write(sequence: str, _output: Any = output) -> None:
             _output.write(sequence)
             _output.flush()
 

glaip_sdk/cli/slash/tui/context.py

@@ -61,13 +61,18 @@ class TUIContext:
         store = get_account_store()
         settings = load_tui_settings(store=store)
 
-        # Handle env var override: normalize empty strings and "default" to None
-        # Empty string from os.getenv() is falsy, so strip() result becomes None in the or expression
         env_theme = os.getenv("AIP_TUI_THEME")
         env_theme = env_theme.strip() if env_theme else None
         if env_theme and env_theme.lower() == "default":
             env_theme = None
 
+        env_mouse = os.getenv("AIP_TUI_MOUSE_CAPTURE")
+        mouse_capture = settings.mouse_capture
+        if env_mouse is not None:
+            mouse_capture = env_mouse.lower() == "true"
+
+        terminal.mouse = mouse_capture
+
         theme_name = env_theme or settings.theme_name
         theme = ThemeManager(
             terminal,

glaip_sdk/cli/slash/tui/layouts/harlequin.py

@@ -19,8 +19,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 try:  # pragma: no cover - optional dependency
-    from textual.containers import Container, Horizontal, Vertical
     from textual.screen import Screen
+    from textual.widget import Widget
 except Exception:  # pragma: no cover - optional dependency
 
     class Screen:  # type: ignore[no-redef]
@@ -30,23 +30,47 @@ except Exception:  # pragma: no cover - optional dependency
             """Return the class for typing subscripts."""
             return cls
 
-    Horizontal = None  # type: ignore[assignment]
-    Vertical = None  # type: ignore[assignment]
-    Container = None  # type: ignore[assignment]
+    Widget = None  # type: ignore[assignment]
 
 if TYPE_CHECKING:
     from glaip_sdk.cli.slash.tui.context import TUIContext
 
 try:  # pragma: no cover - optional dependency
-    from glaip_sdk.cli.slash.tui.toast import Toast
+    from glaip_sdk.cli.slash.tui.toast import Toast, ToastContainer
 except Exception:  # pragma: no cover - optional dependency
     Toast = None  # type: ignore[assignment, misc]
+    ToastContainer = None  # type: ignore[assignment, misc]
 
 # GDP Labs Brand Palette
 PRIMARY_BLUE = "#005CB8"
 BLACK_BACKGROUND = "#000000"
 
 
+if Widget is not None:
+
+    class HarlequinContainer(Widget):
+        """Base container for the Harlequin layout."""
+
+        DEFAULT_CSS = """
+        HarlequinContainer {
+            layout: horizontal;
+        }
+        """
+
+    class HarlequinPane(Widget):
+        """Pane container for Harlequin layout sections."""
+
+        DEFAULT_CSS = """
+        HarlequinPane {
+            layout: vertical;
+        }
+        """
+
+else:
+    HarlequinContainer = None  # type: ignore[assignment, misc]
+    HarlequinPane = None  # type: ignore[assignment, misc]
+
+
 class HarlequinScreen(Screen[None]):  # type: ignore[misc]
     """Base class for Harlequin-style multi-pane screens.
 
@@ -136,19 +160,19 @@ class HarlequinScreen(Screen[None]):  # type: ignore[misc]
         Returns:
             ComposeResult yielding the base layout containers.
         """
-        if Horizontal is None or Vertical is None or Container is None:
+        if HarlequinContainer is None or HarlequinPane is None:
             return
 
         # Main container with horizontal split (25/75)
-        yield Horizontal(
-            Vertical(id="left-pane"),
-            Vertical(id="right-pane"),
+        yield HarlequinContainer(
+            HarlequinPane(id="left-pane"),
+            HarlequinPane(id="right-pane"),
             id="harlequin-container",
         )
 
         # Toast container for notifications
-        if Toast is not None and Container is not None:
-            yield Container(Toast(), id="toast-container")
+        if Toast is not None and ToastContainer is not None:
+            yield ToastContainer(Toast(), id="toast-container")
 
     @property
     def ctx(self) -> TUIContext | None: