glaip-sdk 0.7.9__py3-none-any.whl → 0.7.11__py3-none-any.whl

glaip_sdk/cli/slash/tui/accounts_app.py

@@ -18,7 +18,7 @@ import asyncio
 import logging
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any
+from typing import Any, cast
 
 from glaip_sdk.cli.account_store import AccountStore, AccountStoreError, get_account_store
 from glaip_sdk.cli.commands.common_config import check_connection_with_reason
@@ -31,10 +31,19 @@ from glaip_sdk.cli.slash.tui.background_tasks import BackgroundTaskMixin
 from glaip_sdk.cli.slash.tui.clipboard import ClipboardAdapter, ClipboardResult
 from glaip_sdk.cli.slash.tui.context import TUIContext
 from glaip_sdk.cli.slash.tui.keybind_registry import KeybindRegistry
+from glaip_sdk.cli.slash.tui.layouts.harlequin import HarlequinScreen
 from glaip_sdk.cli.slash.tui.loading import hide_loading_indicator, show_loading_indicator
 from glaip_sdk.cli.slash.tui.terminal import TerminalCapabilities
 from glaip_sdk.cli.slash.tui.theme.catalog import _BUILTIN_THEMES
-from glaip_sdk.cli.slash.tui.toast import ToastBus
+
+try:  # pragma: no cover - optional dependency
+    from glaip_sdk.cli.slash.tui.toast import ClipboardToastMixin, Toast, ToastBus, 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]
+    ToastHandlerMixin = object  # type: ignore[assignment, misc]
+    ToastVariant = None  # type: ignore[assignment]
 from glaip_sdk.cli.validators import validate_api_key
 from glaip_sdk.utils.validation import validate_url
 
@@ -450,7 +459,672 @@ class ConfirmDeleteModal(_ConfirmDeleteBase):  # pragma: no cover - interactive
         self.dismiss(self._name)
 
 
-class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - interactive
+# Widget IDs for Harlequin layout
+HARLEQUIN_ACCOUNTS_LIST_ID = "#harlequin-accounts-list"
+HARLEQUIN_DETAIL_ID = "#harlequin-detail"
+HARLEQUIN_DETAIL_URL_ID = "#harlequin-detail-url"
+HARLEQUIN_DETAIL_KEY_ID = "#harlequin-detail-key"
+HARLEQUIN_DETAIL_STATUS_ID = "#harlequin-detail-status"
+HARLEQUIN_DETAIL_ACTIONS_ID = "#harlequin-detail-actions"
+
+
+class AccountsHarlequinScreen(  # pragma: no cover - interactive
+    ToastHandlerMixin, ClipboardToastMixin, BackgroundTaskMixin, HarlequinScreen
+):
+    """Harlequin layout screen for account management.
+
+    Implements Phase 1 of the TUI Harlequin Layout spec:
+    - Left pane (25%): Account Profile names list
+    - Right pane (75%): URL, API Key (hidden by default), Connection Status, Action Palette
+    """
+
+    CSS_PATH = CSS_FILE_NAME
+
+    BINDINGS = [
+        Binding("enter", "switch_account", "Switch", show=True) if Binding else None,
+        Binding("return", "switch_account", "Switch", show=False) if Binding else None,
+        Binding("/", "focus_filter", "Filter", show=True) if Binding else None,
+        Binding("a", "add_account", "Add", show=True) if Binding else None,
+        Binding("e", "edit_account", "Edit", show=True) if Binding else None,
+        Binding("d", "delete_account", "Delete", show=True) if Binding else None,
+        Binding("c", "copy_account", "Copy", show=True) if Binding else None,
+        Binding("escape", "clear_or_exit", "Close", priority=True) if Binding else None,
+        Binding("q", "app_exit", "Close", priority=True) if Binding else None,
+    ]
+    BINDINGS = [b for b in BINDINGS if b is not None]
+
+    def __init__(
+        self,
+        rows: list[dict[str, str | bool]],
+        active_account: str | None,
+        env_lock: bool,
+        callbacks: AccountsTUICallbacks,
+        ctx: TUIContext | None = None,
+    ) -> None:
+        """Initialize the Harlequin accounts screen.
+
+        Args:
+            rows: Account data rows to display.
+            active_account: Name of the currently active account.
+            env_lock: Whether environment credentials are locking account switching.
+            callbacks: Callbacks for account switching operations.
+            ctx: Shared TUI context.
+        """
+        super().__init__(ctx=ctx)
+        self._store = get_account_store()
+        self._all_rows = rows
+        self._active_account = active_account
+        self._env_lock = env_lock
+        self._account_callbacks = callbacks
+        self._keybinds: KeybindRegistry | None = None
+        self._toast_bus: ToastBus | None = None
+        self._clipboard: ClipboardAdapter | None = None
+        self._filter_text: str = ""
+        self._is_switching = False
+        self._selected_account: dict[str, str | bool] | None = None
+        self._key_visible = False
+        self._initialize_context_services()
+
+    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:
+            return  # type: ignore[return-value]
+
+        # Main container with horizontal split (25/75)
+        with Horizontal(id="harlequin-container"):
+            # Left pane (25% width) with account list
+            with Vertical(id="left-pane"):
+                yield Static("Accounts", id="left-pane-title")
+                yield Input(placeholder="Filter...", id="harlequin-filter")
+                yield DataTable(id=HARLEQUIN_ACCOUNTS_LIST_ID.lstrip("#"))
+            # Right pane (75% width) with account details
+            with Vertical(id="right-pane"):
+                yield Static("Account Details", id="right-pane-title")
+                yield Static("", id=HARLEQUIN_DETAIL_ID.lstrip("#"))
+                with Vertical(id="detail-fields"):
+                    yield Static("URL:", classes="detail-label")
+                    yield Static("", id=HARLEQUIN_DETAIL_URL_ID.lstrip("#"))
+                    yield Static("API Key:", classes="detail-label")
+                    yield Static("", id=HARLEQUIN_DETAIL_KEY_ID.lstrip("#"))
+                    yield Static("Status:", classes="detail-label")
+                    yield Static("", id=HARLEQUIN_DETAIL_STATUS_ID.lstrip("#"))
+                with Horizontal(id=HARLEQUIN_DETAIL_ACTIONS_ID.lstrip("#")):
+                    yield Button("(a) Add", id="action-add")
+                    yield Button("(e) Edit", id="action-edit")
+                    yield Button("(d) Delete", id="action-delete")
+                    yield Button("(c) Copy", id="action-copy")
+                yield Static("", id="harlequin-status")
+                # Help text showing keyboard shortcuts at the bottom
+                yield Static(
+                    "[dim]↑↓ Navigate | Enter Switch | a Add | e Edit | d Delete | c Copy | q/Esc Exit[/dim]",
+                    id="help-text",
+                )
+
+        # Toast container for notifications
+        if Toast is not None:
+            yield Container(Toast(), id="toast-container")
+
+    def on_mount(self) -> None:
+        """Configure the screen after mount."""
+        if not TEXTUAL_SUPPORTED:
+            return
+
+        self._apply_theme()
+        table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+        table.add_column("Account", width=None)
+        table.cursor_type = "row"
+        table.zebra_stripes = True
+        self._reload_accounts_list()
+        table.focus()
+        self._prepare_toasts()
+        self._register_keybinds()
+        self._update_detail_pane()
+
+    def _initialize_context_services(self) -> None:
+        """Initialize TUI context services."""
+
+        def _notify(message: ToastBus.Changed) -> None:
+            self.post_message(message)
+
+        ctx = self.ctx if hasattr(self, "ctx") else self._ctx
+        if ctx:
+            if ctx.keybinds is None:
+                ctx.keybinds = KeybindRegistry()
+            if ctx.toasts is None and ToastBus is not None:
+                ctx.toasts = ToastBus(on_change=_notify)
+            if ctx.clipboard is None:
+                ctx.clipboard = ClipboardAdapter(terminal=ctx.terminal)
+            self._keybinds = ctx.keybinds
+            self._toast_bus = ctx.toasts
+            self._clipboard = ctx.clipboard
+        else:
+            terminal = TerminalCapabilities(
+                tty=True, ansi=True, osc52=False, osc11_bg=None, mouse=False, truecolor=False
+            )
+            self._clipboard = ClipboardAdapter(terminal=terminal)
+            if ToastBus is not None:
+                self._toast_bus = ToastBus(on_change=_notify)
+
+    def _prepare_toasts(self) -> None:
+        """Prepare toast system."""
+        if self._toast_bus:
+            self._toast_bus.clear()
+
+    def _register_keybinds(self) -> None:
+        """Register keybinds with the registry."""
+        if not self._keybinds:
+            return
+        for keybind_def in KEYBIND_DEFINITIONS:
+            scoped_action = f"{KEYBIND_SCOPE}.{keybind_def.action}"
+            if self._keybinds.get(scoped_action):
+                continue
+            try:
+                self._keybinds.register(
+                    action=scoped_action,
+                    key=keybind_def.key,
+                    description=keybind_def.description,
+                    category=KEYBIND_CATEGORY,
+                )
+            except ValueError as e:
+                logging.debug(f"Skipping duplicate keybind registration: {scoped_action}", exc_info=e)
+                continue
+
+    def _reload_accounts_list(self, preferred_name: str | None = None) -> None:
+        """Reload the accounts list in the left pane."""
+        if not TEXTUAL_SUPPORTED:
+            return
+
+        table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+        table.clear()
+
+        filtered = self._filtered_rows()
+        for row in filtered:
+            name = str(row.get("name", ""))
+            # Highlight active account
+            if row.get("name") == self._active_account:
+                name = f"[green]●[/] {name}"
+            table.add_row(name)
+
+        # Move cursor to active or preferred account
+        cursor_idx = 0
+        target_name = preferred_name or self._active_account
+        for idx, row in enumerate(filtered):
+            if row.get("name") == target_name:
+                cursor_idx = idx
+                break
+
+        if filtered:
+            table.cursor_coordinate = (cursor_idx, 0)
+            self._update_selected_account(filtered[cursor_idx] if cursor_idx < len(filtered) else None)
+        else:
+            self._update_selected_account(None)
+            self._set_status("No accounts match the current filter.", "yellow")
+
+    def _filtered_rows(self) -> list[dict[str, str | bool]]:
+        """Return filtered account rows."""
+        if not self._filter_text:
+            return list(self._all_rows)
+
+        needle = self._filter_text.lower()
+        filtered = [
+            row
+            for row in self._all_rows
+            if needle in str(row.get("name", "")).lower() or needle in str(row.get("api_url", "")).lower()
+        ]
+
+        def score(row: dict[str, str | bool]) -> tuple[int, str]:
+            name = str(row.get("name", "")).lower()
+            url = str(row.get("api_url", "")).lower()
+            name_hit = needle in name
+            url_hit = needle in url
+            priority = 0 if name_hit else (1 if url_hit else 2)
+            return (priority, name)
+
+        return sorted(filtered, key=score)
+
+    def _update_selected_account(self, account: dict[str, str | bool] | None) -> None:
+        """Update the selected account and refresh detail pane."""
+        self._selected_account = account
+        self._update_detail_pane()
+
+    def _update_detail_pane(self) -> None:
+        """Update the right pane with selected account details."""
+        if not TEXTUAL_SUPPORTED:
+            return
+
+        if not self._selected_account:
+            detail = self.query_one(HARLEQUIN_DETAIL_ID, Static)
+            detail.update("[dim]Select an account to view details[/]")
+            url_widget = self.query_one(HARLEQUIN_DETAIL_URL_ID, Static)
+            url_widget.update("")
+            key_widget = self.query_one(HARLEQUIN_DETAIL_KEY_ID, Static)
+            key_widget.update("")
+            status_widget = self.query_one(HARLEQUIN_DETAIL_STATUS_ID, Static)
+            status_widget.update("")
+            return
+
+        account = self._selected_account
+        name = str(account.get("name", ""))
+        url = str(account.get("api_url", ""))
+        masked_key = str(account.get("masked_key", ""))
+        api_key = str(account.get("api_key", ""))
+
+        # Update detail header
+        detail = self.query_one(HARLEQUIN_DETAIL_ID, Static)
+        detail.update(f"[bold]{name}[/]")
+
+        # Update URL
+        url_widget = self.query_one(HARLEQUIN_DETAIL_URL_ID, Static)
+        url_widget.update(url)
+
+        # Update API Key (hidden by default, toggle with button)
+        key_widget = self.query_one(HARLEQUIN_DETAIL_KEY_ID, Static)
+        if self._key_visible and api_key:
+            key_widget.update(api_key)
+        else:
+            key_widget.update(masked_key)
+
+        # Update Status
+        row_for_status = dict(account)
+        row_for_status["active"] = row_for_status.get("name") == self._active_account
+        status_str = build_account_status_string(row_for_status, use_markup=True)
+        status_widget = self.query_one(HARLEQUIN_DETAIL_STATUS_ID, Static)
+        status_widget.update(status_str)
+
+    def _set_status(self, message: str, style: str) -> None:
+        """Update status message."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        status = self.query_one("#harlequin-status", Static)
+        status.update(f"[{style}]{message}[/]")
+
+    def _get_selected_name(self) -> str | None:
+        """Get the name of the currently selected account."""
+        if not TEXTUAL_SUPPORTED or not self._selected_account:
+            return None
+        return str(self._selected_account.get("name", ""))
+
+    def action_switch_account(self) -> None:
+        """Switch to the currently selected account."""
+        if self._env_lock:
+            self._set_status("Switching disabled: env credentials in use.", "yellow")
+            return
+
+        # Ensure account is selected from cursor position if not explicitly selected
+        if not self._selected_account:
+            try:
+                table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+                cursor_row = table.cursor_row
+                if cursor_row is not None and cursor_row >= 0:
+                    filtered = self._filtered_rows()
+                    if cursor_row < len(filtered):
+                        self._update_selected_account(filtered[cursor_row])
+            except Exception:
+                pass
+
+        name = self._get_selected_name()
+        if not name:
+            self._set_status("No account selected.", "yellow")
+            return
+
+        if self._is_switching:
+            self._set_status("Already switching...", "yellow")
+            return
+
+        self._is_switching = True
+        host = self._get_host_for_name(name)
+        message = f"Connecting to '{name}' ({host})..." if host else f"Connecting to '{name}'..."
+        self._set_status(message, "cyan")
+        self._queue_switch(name)
+
+    def _get_host_for_name(self, name: str | None) -> str | None:
+        """Return shortened API URL for a given account name."""
+        if not name:
+            return None
+        for row in self._all_rows:
+            if row.get("name") == name:
+                url = str(row.get("api_url", ""))
+                return url if len(url) <= 40 else f"{url[:37]}..."
+        return None
+
+    def _queue_switch(self, name: str) -> None:
+        """Run switch in background."""
+
+        async def perform() -> None:
+            try:
+                switched, message = await asyncio.to_thread(self._account_callbacks.switch_account, name)
+            except Exception as exc:
+                self._set_status(f"Switch failed: {exc}", "red")
+                return
+            finally:
+                self._is_switching = False
+
+            if switched:
+                # Refresh active account from store to ensure consistency
+                self._active_account = self._store.get_active_account() or name
+                status_msg = message or f"Switched to '{name}'."
+                if self._toast_bus:
+                    self._toast_bus.show(message=status_msg, variant="success")
+                self._set_status(status_msg, "green")
+                # Reload accounts list to update green indicator
+                self._reload_accounts_list(preferred_name=name)
+                self._update_detail_pane()
+            else:
+                self._set_status(message or "Switch failed; kept previous account.", "yellow")
+
+        try:
+            self.track_task(perform(), logger=logging.getLogger(__name__))
+        except Exception as exc:
+            self._is_switching = False
+            self._set_status(f"Switch failed to start: {exc}", "red")
+
+    def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:  # type: ignore[override]
+        """Handle row selection in the accounts list."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+        try:
+            table.cursor_coordinate = (event.cursor_row, 0)
+        except Exception:
+            return
+        filtered = self._filtered_rows()
+        if event.cursor_row < len(filtered):
+            self._update_selected_account(filtered[event.cursor_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:
+            return
+        filtered = self._filtered_rows()
+        if event.cursor_row is not None and event.cursor_row < len(filtered):
+            self._update_selected_account(filtered[event.cursor_row])
+
+    def action_focus_filter(self) -> None:
+        """Focus the filter input."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        filter_input = self.query_one("#harlequin-filter", Input)
+        filter_input.value = self._filter_text
+        filter_input.focus()
+
+    def on_input_changed(self, event: Input.Changed) -> None:
+        """Handle filter input changes."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        if event.input.id == "harlequin-filter":
+            self._filter_text = (event.value or "").strip()
+            self._reload_accounts_list()
+
+    def action_add_account(self) -> None:
+        """Open add account modal."""
+        if self._check_env_lock():
+            return
+        existing_names = {str(row.get("name", "")) for row in self._all_rows}
+        modal = AccountFormModal(
+            mode="add",
+            existing=None,
+            existing_names=existing_names,
+            connection_tester=lambda url, key: check_connection_with_reason(url, key, abort_on_error=False),
+            validate_name=self._store.validate_account_name,
+        )
+        self.app.push_screen(modal, self._on_form_result)
+
+    def action_edit_account(self) -> None:
+        """Open edit account modal."""
+        if self._check_env_lock():
+            return
+        name = self._get_selected_name()
+        if not name:
+            self._set_status("Select an account to edit.", "yellow")
+            return
+        account = self._store.get_account(name)
+        if not account:
+            self._set_status(f"Account '{name}' not found.", "red")
+            return
+        existing_names = {str(row.get("name", "")) for row in self._all_rows if str(row.get("name", "")) != name}
+        modal = AccountFormModal(
+            mode="edit",
+            existing={"name": name, "api_url": account.get("api_url", ""), "api_key": account.get("api_key", "")},
+            existing_names=existing_names,
+            connection_tester=lambda url, key: check_connection_with_reason(url, key, abort_on_error=False),
+            validate_name=self._store.validate_account_name,
+        )
+        self.app.push_screen(modal, self._on_form_result)
+
+    def action_delete_account(self) -> None:
+        """Open delete confirmation modal."""
+        if self._check_env_lock():
+            return
+        name = self._get_selected_name()
+        if not name:
+            self._set_status("Select an account to delete.", "yellow")
+            return
+        accounts = self._store.list_accounts()
+        if len(accounts) <= 1:
+            self._set_status("Cannot remove the last remaining account.", "red")
+            return
+        self.app.push_screen(ConfirmDeleteModal(name), self._on_delete_result)
+
+    def _ensure_account_selected_from_cursor(self) -> None:
+        """Ensure an account is selected, using cursor position if needed."""
+        if self._selected_account:
+            return
+        try:
+            table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+            cursor_row = table.cursor_row
+            if cursor_row is not None and cursor_row >= 0:
+                row = table.get_row_at(cursor_row)
+                if row:
+                    account_name = str(row[0])
+                    # Find the account data
+                    for account_data in self._all_rows:
+                        if str(account_data.get("name", "")) == account_name:
+                            self._selected_account = account_data
+                            self._update_detail_pane()
+                            break
+        except Exception:
+            pass
+
+    def action_copy_account(self) -> None:
+        """Copy selected account to clipboard."""
+        # 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 copy.", "yellow")
+            return
+
+        account = self._store.get_account(name)
+        if not account:
+            return
+
+        text = f"Account: {name}\nURL: {account.get('api_url', '')}"
+        adapter = self._clipboard_adapter()
+        writer = self._osc52_writer()
+        if writer:
+            result = adapter.copy(text, writer=writer)
+        else:
+            result = adapter.copy(text)
+        self._handle_copy_result(name, result)
+
+    def _handle_copy_result(self, name: str, result: ClipboardResult) -> None:
+        """Handle copy operation result."""
+        if result.success:
+            if self._toast_bus:
+                self._toast_bus.copy_success(f"Account '{name}'")
+            self._set_status(f"Copied '{name}' to clipboard.", "green")
+        else:
+            if self._toast_bus and ToastVariant is not None:
+                self._toast_bus.show(message=f"Copy failed: {result.message}", variant=ToastVariant.WARNING)
+            self._set_status(f"Copy failed: {result.message}", "red")
+
+    def _clipboard_adapter(self) -> ClipboardAdapter:
+        """Get clipboard adapter."""
+        ctx = self.ctx if hasattr(self, "ctx") else getattr(self, "_ctx", None)
+        if ctx is not None and ctx.clipboard is not None:
+            return cast(ClipboardAdapter, ctx.clipboard)
+        if self._clipboard is not None:
+            return self._clipboard
+        adapter = ClipboardAdapter(terminal=ctx.terminal if ctx else None)
+        if ctx is not None:
+            ctx.clipboard = adapter
+        else:
+            self._clipboard = adapter
+        return adapter
+
+    def _osc52_writer(self) -> Callable[[str], Any] | None:
+        """Get OSC52 writer if available."""
+        try:
+            console = getattr(self, "console", None)
+        except Exception:
+            return None
+        if console is None:
+            return None
+        output = getattr(console, "file", None)
+        if output is None:
+            return None
+
+        def _write(sequence: str, _output=output) -> None:
+            _output.write(sequence)
+            _output.flush()
+
+        return _write
+
+    def _check_env_lock(self) -> bool:
+        """Check if env lock prevents mutations."""
+        if not self._is_env_locked():
+            return False
+        self._env_lock = True
+        self._set_status("Disabled by env-lock.", "yellow")
+        self._refresh_rows()
+        return True
+
+    def _is_env_locked(self) -> bool:
+        """Check if environment credentials are locking operations."""
+        return env_credentials_present(partial=True)
+
+    def _on_form_result(self, payload: dict[str, Any] | None) -> None:
+        """Handle add/edit modal result."""
+        if payload is None:
+            self._set_status("Edit/add cancelled.", "yellow")
+            return
+        self._save_account(payload)
+
+    def _on_delete_result(self, confirmed_name: str | None) -> None:
+        """Handle delete confirmation result."""
+        if not confirmed_name:
+            self._set_status("Delete cancelled.", "yellow")
+            return
+        try:
+            self._store.remove_account(confirmed_name)
+        except AccountStoreError as exc:
+            self._set_status(f"Delete failed: {exc}", "red")
+            return
+        except Exception as exc:
+            self._set_status(f"Unexpected delete error: {exc}", "red")
+            return
+
+        self._set_status(f"Account '{confirmed_name}' deleted.", "green")
+        self._refresh_rows()
+
+    def _save_account(self, payload: dict[str, Any]) -> None:
+        """Save account from modal payload."""
+        if self._is_env_locked():
+            self._set_status("Disabled by env-lock.", "yellow")
+            return
+
+        name = str(payload.get("name", ""))
+        api_url = str(payload.get("api_url", ""))
+        api_key = str(payload.get("api_key", ""))
+        set_active = bool(payload.get("set_active", payload.get("mode") == "add"))
+        is_edit = payload.get("mode") == "edit"
+
+        try:
+            self._store.add_account(name, api_url, api_key, overwrite=is_edit)
+        except AccountStoreError as exc:
+            self._set_status(f"Save failed: {exc}", "red")
+            return
+        except Exception as exc:
+            self._set_status(f"Unexpected save error: {exc}", "red")
+            return
+
+        if set_active:
+            try:
+                self._store.set_active_account(name)
+                self._active_account = name
+            except Exception as exc:
+                self._set_status(f"Saved but could not set active: {exc}", "yellow")
+            else:
+                if self._toast_bus:
+                    self._toast_bus.show(message=f"Switched to '{name}'", variant="success")
+
+        self._set_status(f"Account '{name}' saved.", "green")
+        self._refresh_rows(preferred_name=name)
+
+    def _refresh_rows(self, preferred_name: str | None = None) -> None:
+        """Refresh account rows from store."""
+        self._env_lock = self._is_env_locked()
+        self._all_rows, self._active_account = _build_account_rows_from_store(self._store, self._env_lock)
+        self._reload_accounts_list(preferred_name=preferred_name)
+        if self._selected_account:
+            # Refresh selected account details
+            name = str(self._selected_account.get("name", ""))
+            for row in self._all_rows:
+                if row.get("name") == name:
+                    self._update_selected_account(row)
+                    break
+
+    def action_clear_or_exit(self) -> None:
+        """Clear filter or exit."""
+        if not TEXTUAL_SUPPORTED:
+            return
+        filter_input = self.query_one("#harlequin-filter", Input)
+        if filter_input.has_focus:
+            if filter_input.value or self._filter_text:
+                filter_input.value = ""
+                self._filter_text = ""
+                self._reload_accounts_list()
+            table = self.query_one(HARLEQUIN_ACCOUNTS_LIST_ID, DataTable)
+            table.focus()
+            return
+        self.dismiss()
+
+    def action_app_exit(self) -> None:
+        """Exit the application."""
+        self.dismiss()
+
+    def _apply_theme(self) -> None:
+        """Apply theme from context."""
+        ctx = self.ctx if hasattr(self, "ctx") else getattr(self, "_ctx", None)
+        if not ctx or not ctx.theme or Theme is None:
+            return
+
+        app = self.app
+        if app is None:
+            return
+
+        for name, tokens in _BUILTIN_THEMES.items():
+            app.register_theme(
+                Theme(
+                    name=name,
+                    primary=tokens.primary,
+                    secondary=tokens.secondary,
+                    accent=tokens.accent,
+                    warning=tokens.warning,
+                    error=tokens.error,
+                    success=tokens.success,
+                )
+            )
+
+        app.theme = ctx.theme.theme_name
+
+
+class AccountsTextualApp(  # pragma: no cover - interactive
+    ToastHandlerMixin, ClipboardToastMixin, BackgroundTaskMixin, _AppBase
+):
     """Textual application for browsing accounts."""
 
     CSS_PATH = CSS_FILE_NAME
@@ -490,76 +1164,43 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
         self._all_rows = rows
         self._active_account = active_account
         self._env_lock = env_lock
-        self._callbacks = callbacks
+        self._account_callbacks = callbacks
         self._ctx = ctx
         self._keybinds: KeybindRegistry | None = None
         self._toast_bus: ToastBus | None = None
-        self._toast_ready = False
         self._clipboard: ClipboardAdapter | None = None
         self._filter_text: str = ""
         self._is_switching = False
         self._initialize_context_services()
 
     def compose(self) -> ComposeResult:
-        """Build the Textual layout."""
-        header_text = self._header_text()
-        yield Static(header_text, id="header-info")
-        if self._env_lock:
-            yield Static(
-                "Env credentials detected (AIP_API_URL/AIP_API_KEY); add/edit/delete are disabled.",
-                id="env-lock",
-            )
-        clear_btn = Button("Clear", id="filter-clear")
-        clear_btn.display = False  # hide until filter has content
-        filter_bar = Horizontal(
-            Static("Filter (/):", id="filter-label"),
-            Input(placeholder="Type to filter by name or host", id="filter-input"),
-            clear_btn,
-            id="filter-container",
-        )
-        filter_bar.styles.padding = (0, 0)
-        main = Vertical(
-            filter_bar,
-            DataTable(id=ACCOUNTS_TABLE_ID.lstrip("#")),
-        )
-        # Avoid large gaps; keep main content filling available space
-        main.styles.height = "1fr"
-        main.styles.padding = (0, 0)
-        yield main
-        yield Horizontal(
-            LoadingIndicator(id=ACCOUNTS_LOADING_ID.lstrip("#")),
-            Static("", id=STATUS_ID.lstrip("#")),
-            id="status-bar",
-        )
+        """Build the Textual app (empty, screen is pushed on mount)."""
+        # The app itself is empty; AccountsHarlequinScreen is pushed on mount
+        if not TEXTUAL_SUPPORTED or Footer is None:
+            return  # type: ignore[return-value]
         yield Footer()
 
     def on_mount(self) -> None:
-        """Configure table columns and load rows."""
+        """Push the Harlequin accounts screen on mount."""
         self._apply_theme()
-        table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
-        table.add_column("Name", width=20)
-        table.add_column("API URL", width=40)
-        table.add_column("Key (masked)", width=20)
-        table.add_column("Status", width=14)
-        table.cursor_type = "row"
-        table.zebra_stripes = True
-        table.styles.height = "1fr"  # Fill available space below the filter
-        table.styles.margin = 0
-        self._reload_rows()
-        table.focus()
-        # Keep the filter tight to the table
-        main = self.query_one(Vertical)
-        main.styles.gap = 0
-        self._update_filter_button_visibility()
-        self._prepare_toasts()
-        self._register_keybinds()
+        harlequin_screen = AccountsHarlequinScreen(
+            rows=self._all_rows,
+            active_account=self._active_account,
+            env_lock=self._env_lock,
+            callbacks=self._account_callbacks,
+            ctx=self._ctx,
+        )
+        self.push_screen(harlequin_screen)
 
     def _initialize_context_services(self) -> None:
+        def _notify(message: ToastBus.Changed) -> None:
+            self.post_message(message)
+
         if self._ctx:
             if self._ctx.keybinds is None:
                 self._ctx.keybinds = KeybindRegistry()
-            if self._ctx.toasts is None:
-                self._ctx.toasts = ToastBus()
+            if self._ctx.toasts is None and ToastBus is not None:
+                self._ctx.toasts = ToastBus(on_change=_notify)
             if self._ctx.clipboard is None:
                 self._ctx.clipboard = ClipboardAdapter(terminal=self._ctx.terminal)
             self._keybinds = self._ctx.keybinds
@@ -571,10 +1212,11 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
                 tty=True, ansi=True, osc52=False, osc11_bg=None, mouse=False, truecolor=False
             )
             self._clipboard = ClipboardAdapter(terminal=terminal)
+            if ToastBus is not None:
+                self._toast_bus = ToastBus(on_change=_notify)
 
     def _prepare_toasts(self) -> None:
-        """Prepare toast system by marking ready and clearing any existing toasts."""
-        self._toast_ready = True
+        """Prepare toast system by clearing any existing toasts."""
         if self._toast_bus:
             self._toast_bus.clear()
 
@@ -621,16 +1263,32 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
     def action_focus_filter(self) -> None:
         """Focus the filter input and clear previous text."""
-        filter_input = self.query_one(FILTER_INPUT_ID, Input)
-        filter_input.value = self._filter_text
-        filter_input.focus()
+        # Skip if Harlequin screen is active (it handles its own filter focus)
+        if isinstance(self.screen, AccountsHarlequinScreen):
+            return
+        try:
+            filter_input = self.query_one(FILTER_INPUT_ID, Input)
+            filter_input.value = self._filter_text
+            filter_input.focus()
+        except Exception:
+            # Filter input doesn't exist, skip
+            pass
 
     def action_switch_row(self) -> None:
-        """Switch to the currently selected account."""
+        """Switch to the currently selected account.
+
+        Note: This action is for the old table layout. When using HarlequinScreen,
+        the screen handles switching directly. This gracefully skips if the
+        old table doesn't exist.
+        """
+        try:
+            table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+        except Exception:
+            # Harlequin screen is active, let it handle the action
+            return
         if self._env_lock:
             self._set_status("Switching disabled: env credentials in use.", "yellow")
             return
-        table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
         if table.cursor_row is None:
             self._set_status("No account selected.", "yellow")
             return
@@ -652,8 +1310,17 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
         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."""
-        table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+        """Handle mouse click selection by triggering switch.
+
+        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.
+        """
+        try:
+            table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+        except Exception:
+            # Harlequin screen is active, let it handle the event
+            return
         try:
             # Move cursor to clicked row then switch
             table.cursor_coordinate = (event.cursor_row, 0)
@@ -671,18 +1338,32 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
     def on_input_changed(self, event: Input.Changed) -> None:
         """Apply filter live as the user types."""
+        # Skip if Harlequin screen is active (it handles its own filtering)
+        if isinstance(self.screen, AccountsHarlequinScreen):
+            return
         self._filter_text = (event.value or "").strip()
         self._reload_rows()
         self._update_filter_button_visibility()
 
     def _reload_rows(self, preferred_name: str | None = None) -> None:
         """Refresh table rows based on current filter/active state."""
+        # Skip if Harlequin screen is active (it handles its own reloading)
+        try:
+            if isinstance(self.screen, AccountsHarlequinScreen):
+                return
+        except Exception:  # pragma: no cover - defensive (e.g., ScreenStackError in tests)
+            # App not fully initialized or no screen pushed, continue with normal reload
+            pass
         # Work on a copy to avoid mutating the backing rows list
         rows_copy = [dict(row) for row in self._all_rows]
         for row in rows_copy:
             row["active"] = row.get("name") == self._active_account
 
-        table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+        try:
+            table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+        except Exception:
+            # Harlequin screen is active, skip
+            return
         table.clear()
         filtered = self._filtered_rows(rows_copy)
         for row in filtered:
@@ -768,7 +1449,7 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
         self._hide_loading()
         self._is_switching = False
         error_msg = f"Switch failed to start: {exc}"
-        if self._toast_ready and self._toast_bus:
+        if self._toast_bus:
             self._toast_bus.show(message=error_msg, variant="error")
         try:
             self._set_status(error_msg, "red")
@@ -779,9 +1460,16 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
     def _clear_filter(self) -> None:
         """Clear the filter input and reset filter state."""
-        filter_input = self.query_one(FILTER_INPUT_ID, Input)
-        filter_input.value = ""
-        self._filter_text = ""
+        # Skip if Harlequin screen is active (it handles its own filtering)
+        if isinstance(self.screen, AccountsHarlequinScreen):
+            return
+        try:
+            filter_input = self.query_one(FILTER_INPUT_ID, Input)
+            filter_input.value = ""
+            self._filter_text = ""
+        except Exception:
+            # Filter input doesn't exist, just clear the text
+            self._filter_text = ""
         self._update_filter_button_visibility()
 
     def _queue_switch(self, name: str) -> None:
@@ -789,7 +1477,7 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
         async def perform() -> None:
             try:
-                switched, message = await asyncio.to_thread(self._callbacks.switch_account, name)
+                switched, message = await asyncio.to_thread(self._account_callbacks.switch_account, name)
             except Exception as exc:  # pragma: no cover - defensive
                 self._set_status(f"Switch failed: {exc}", "red")
                 return
@@ -800,7 +1488,7 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
             if switched:
                 self._active_account = name
                 status_msg = message or f"Switched to '{name}'."
-                if self._toast_ready and self._toast_bus:
+                if self._toast_bus:
                     self._toast_bus.show(message=status_msg, variant="success")
                 self._update_header()
                 self._reload_rows()
@@ -822,15 +1510,26 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
         UX note: helps users reset the list without leaving the TUI.
         """
-        filter_input = self.query_one(FILTER_INPUT_ID, Input)
-        if filter_input.has_focus:
-            # Clear when there is text; otherwise just move focus back to the table
-            if filter_input.value or self._filter_text:
-                self._clear_filter()
-                self._reload_rows()
-            table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
-            table.focus()
+        # Skip if Harlequin screen is active (it handles its own exit)
+        if isinstance(self.screen, AccountsHarlequinScreen):
+            self.exit()
             return
+        try:
+            filter_input = self.query_one(FILTER_INPUT_ID, Input)
+            if filter_input.has_focus:
+                # Clear when there is text; otherwise just move focus back to the table
+                if filter_input.value or self._filter_text:
+                    self._clear_filter()
+                    self._reload_rows()
+                try:
+                    table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+                    table.focus()
+                except Exception:
+                    pass
+                return
+        except Exception:
+            # Filter input doesn't exist, just exit
+            pass
         self.exit()
 
     def action_app_exit(self) -> None:
@@ -913,34 +1612,54 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
             return
 
         text = f"Account: {name}\nURL: {account.get('api_url', '')}"
-        adapter = self._clipboard or ClipboardAdapter(terminal=self._ctx.terminal if self._ctx else None)
-        # OSC 52 works by writing to stdout, no custom writer needed
-        try:
-            asyncio.get_running_loop()
-        except RuntimeError:
+        adapter = self._clipboard_adapter()
+        writer = self._osc52_writer()
+        if writer:
+            result = adapter.copy(text, writer=writer)
+        else:
             result = adapter.copy(text)
-            self._handle_copy_result(name, result)
-            return
-
-        async def perform() -> None:
-            result = await asyncio.to_thread(adapter.copy, text)
-            self._handle_copy_result(name, result)
-
-        self.track_task(perform(), logger=logging.getLogger(__name__))
+        self._handle_copy_result(name, result)
 
     def _handle_copy_result(self, name: str, result: ClipboardResult) -> None:
         """Update UI state after a copy attempt."""
         if result.success:
-            if self._toast_ready and self._toast_bus:
-                self._toast_bus.copy_success(label=name)
-            # Status fallback until toast widget is implemented (see specs/workflow/tui-toast-system/spec.md Phase 2)
+            if self._toast_bus:
+                self._toast_bus.copy_success(f"Account '{name}'")
             self._set_status(f"Copied '{name}' to clipboard.", "green")
         else:
-            if self._toast_ready and self._toast_bus:
-                self._toast_bus.show(message=f"Copy failed: {result.message}", variant="warning")
-            # Status fallback until toast widget is implemented (see specs/workflow/tui-toast-system/spec.md Phase 2)
+            if self._toast_bus and ToastVariant is not None:
+                self._toast_bus.show(message=f"Copy failed: {result.message}", variant=ToastVariant.WARNING)
             self._set_status(f"Copy failed: {result.message}", "red")
 
+    def _clipboard_adapter(self) -> ClipboardAdapter:
+        if self._ctx is not None and self._ctx.clipboard is not None:
+            return cast(ClipboardAdapter, self._ctx.clipboard)
+        if self._clipboard is not None:
+            return self._clipboard
+        adapter = ClipboardAdapter(terminal=self._ctx.terminal if self._ctx else None)
+        if self._ctx is not None:
+            self._ctx.clipboard = adapter
+        else:
+            self._clipboard = adapter
+        return adapter
+
+    def _osc52_writer(self) -> Callable[[str], Any] | None:
+        try:
+            console = getattr(self, "console", None)
+        except Exception:
+            return None
+        if console is None:
+            return None
+        output = getattr(console, "file", None)
+        if output is None:
+            return None
+
+        def _write(sequence: str, _output=output) -> None:
+            _output.write(sequence)
+            _output.flush()
+
+        return _write
+
     def _check_env_lock_hotkey(self) -> bool:
         """Prevent mutations when env credentials are present."""
         if not self._is_env_locked():
@@ -1060,9 +1779,16 @@ class AccountsTextualApp(BackgroundTaskMixin, _AppBase):  # pragma: no cover - i
 
     def _update_filter_button_visibility(self) -> None:
         """Show clear button only when filter has content."""
-        filter_input = self.query_one(FILTER_INPUT_ID, Input)
-        clear_btn = self.query_one("#filter-clear", Button)
-        clear_btn.display = bool(filter_input.value or self._filter_text)
+        # Skip if Harlequin screen is active (it doesn't have this button)
+        if isinstance(self.screen, AccountsHarlequinScreen):
+            return
+        try:
+            filter_input = self.query_one(FILTER_INPUT_ID, Input)
+            clear_btn = self.query_one("#filter-clear", Button)
+            clear_btn.display = bool(filter_input.value or self._filter_text)
+        except Exception:
+            # Filter input or clear button doesn't exist, skip
+            pass
 
     def _apply_theme(self) -> None:
         """Register built-in themes and set the active one from context."""