glaip-sdk 0.7.27__py3-none-any.whl → 0.7.28__py3-none-any.whl

glaip_sdk/cli/slash/tui/__init__.py

@@ -10,8 +10,8 @@ from glaip_sdk.cli.slash.tui.keybind_registry import (
     parse_key_sequence,
 )
 from glaip_sdk.cli.slash.tui.remote_runs_app import (
-    RemoteRunsTextualApp,
     RemoteRunsTUICallbacks,
+    RunsHarlequinScreen,
     run_remote_runs_textual,
 )
 from glaip_sdk.cli.slash.tui.terminal import TerminalCapabilities, detect_terminal_background
@@ -23,7 +23,7 @@ __all__ = [
     "ToastVariant",
     "TerminalCapabilities",
     "detect_terminal_background",
-    "RemoteRunsTextualApp",
+    "RunsHarlequinScreen",
     "RemoteRunsTUICallbacks",
     "run_remote_runs_textual",
     "KeybindRegistry",

glaip_sdk/cli/slash/tui/accounts_app.py

@@ -52,7 +52,7 @@ from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical
 from textual.coordinate import Coordinate
-from textual.screen import ModalScreen
+from textual.screen import ModalScreen, Screen
 from textual.suggester import SuggestFromList
 from textual.theme import Theme
 from textual.widgets import Button, Checkbox, DataTable, Footer, Input, Static
@@ -107,6 +107,37 @@ class AccountsTUICallbacks:
     switch_account: Callable[[str], tuple[bool, str]]
 
 
+def _ensure_context_services(
+    ctx: TUIContext,
+    notify: Callable[[ToastBus.Changed], None],
+) -> tuple[KeybindRegistry | None, ToastBus | None, ClipboardAdapter]:
+    """Ensure the context has keybinds, toasts, and clipboard services."""
+    if ctx.keybinds is None:
+        ctx.keybinds = KeybindRegistry()
+    if ctx.toasts is None:
+        ctx.toasts = ToastBus(on_change=notify)
+    if ctx.clipboard is None:
+        ctx.clipboard = ClipboardAdapter(terminal=ctx.terminal)
+    return ctx.keybinds, ctx.toasts, ctx.clipboard
+
+
+def _initialize_fallback_services(
+    notify: Callable[[ToastBus.Changed], None],
+) -> tuple[KeybindRegistry | None, ToastBus | None, ClipboardAdapter]:
+    """Create fallback clipboard and toast services without a context."""
+    terminal = TerminalCapabilities(tty=True, ansi=True, osc52=False, osc11_bg=None, mouse=False, truecolor=False)
+    clipboard = ClipboardAdapter(terminal=terminal)
+    toast_bus = ToastBus(on_change=notify)
+    return None, toast_bus, clipboard
+
+
+def _wire_toast_notifications(toast_bus: ToastBus | None, notify: Callable[[ToastBus.Changed], None]) -> None:
+    """Ensure toast bus forwards notifications to the provided callback."""
+    if toast_bus is None:
+        return
+    toast_bus.subscribe(notify)
+
+
 def _build_account_rows_from_store(
     store: AccountStore,
     env_lock: bool,
@@ -232,7 +263,12 @@ def run_accounts_textual(
     if not TEXTUAL_SUPPORTED:
         return
     app = AccountsTextualApp(rows, active_account, env_lock, callbacks, ctx=ctx)
-    app.run()
+    mouse_enabled = True
+    if ctx is not None:
+        terminal = getattr(ctx, "terminal", None)
+        if terminal is not None:
+            mouse_enabled = bool(getattr(terminal, "mouse", True))
+    app.run(mouse=mouse_enabled)
 
 
 class AccountFormModal(_AccountFormBase):  # pragma: no cover - interactive
@@ -543,8 +579,7 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
                 )
 
         # Toast container for notifications
-        if Toast is not None and ToastContainer is not None:
-            yield ToastContainer(Toast(), id="toast-container")
+        yield ToastContainer(Toast(), id="toast-container")
 
     def on_mount(self) -> None:
         """Configure the screen after mount."""
@@ -567,29 +602,31 @@ class AccountsHarlequinScreen(  # pragma: no cover - interactive
         """Initialize TUI context services."""
 
         def _notify(message: ToastBus.Changed) -> None:
+            # Post to self (Screen) so ToastHandlerMixin.on_toast_bus_changed can handle it.
             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._clip_cache = ctx.clipboard
-        else:
-            terminal = TerminalCapabilities(
-                tty=True, ansi=True, osc52=False, osc11_bg=None, mouse=False, truecolor=False
-            )
-            self._clip_cache = ClipboardAdapter(terminal=terminal)
-            if ToastBus is not None:
-                self._toast_bus = ToastBus(on_change=_notify)
+        if ctx is None:
+            self._keybinds, self._toast_bus, self._clip_cache = _initialize_fallback_services(_notify)
+            return
+
+        self._keybinds, self._toast_bus, self._clip_cache = _ensure_context_services(ctx, _notify)
+        _wire_toast_notifications(self._toast_bus, _notify)
+
+    def _ensure_toast_bus(self) -> None:
+        """Ensure toast bus is initialized with proper message routing."""
+        if self._toast_bus is not None:
+            return
+
+        def _notify(message: ToastBus.Changed) -> None:
+            # Post to self (Screen) so ToastHandlerMixin.on_toast_bus_changed can handle it.
+            self.post_message(message)
+
+        self._toast_bus = ToastBus(on_change=_notify)
 
     def _prepare_toasts(self) -> None:
         """Prepare toast system."""
+        self._ensure_toast_bus()
         if self._toast_bus:
             self._toast_bus.clear()
 
@@ -1230,26 +1267,33 @@ class AccountsTextualApp(  # pragma: no cover - interactive
 
     def _initialize_context_services(self) -> None:
         def _notify(message: ToastBus.Changed) -> None:
-            self.post_message(message)
+            """Route messages to the active screen or app."""
+            screen = self._safe_screen()
+            if screen is not None:
+                self._safe_post_message(screen, message)
+                return
+            self._safe_post_message(self, message)
 
-        if self._ctx:
-            if self._ctx.keybinds is None:
-                self._ctx.keybinds = KeybindRegistry()
-            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
-            self._toast_bus = self._ctx.toasts
-            self._clip_cache = self._ctx.clipboard
-        else:
-            # Fallback: create services independently when ctx is None
-            terminal = TerminalCapabilities(
-                tty=True, ansi=True, osc52=False, osc11_bg=None, mouse=False, truecolor=False
-            )
-            self._clip_cache = ClipboardAdapter(terminal=terminal)
-            if ToastBus is not None:
-                self._toast_bus = ToastBus(on_change=_notify)
+        if self._ctx is None:
+            self._keybinds, self._toast_bus, self._clip_cache = _initialize_fallback_services(_notify)
+            return
+
+        self._keybinds, self._toast_bus, self._clip_cache = _ensure_context_services(self._ctx, _notify)
+        _wire_toast_notifications(self._toast_bus, _notify)
+
+    def _safe_screen(self) -> Screen | None:
+        """Return the active screen when available."""
+        try:
+            return self.screen
+        except Exception:
+            return None
+
+    def _safe_post_message(self, target: Screen | App[Any], message: ToastBus.Changed) -> None:
+        """Post a toast message while guarding against failures."""
+        try:
+            target.post_message(message)
+        except Exception:
+            return
 
     def _prepare_toasts(self) -> None:
         """Prepare toast system by clearing any existing toasts."""
@@ -1517,7 +1561,11 @@ class AccountsTextualApp(  # pragma: no cover - interactive
     def _clear_filter(self) -> None:
         """Clear the filter input and reset filter state."""
         # Skip if Harlequin screen is active (it handles its own filtering)
-        if isinstance(self.screen, AccountsHarlequinScreen):
+        try:
+            screen = self.screen
+        except Exception:
+            screen = None
+        if isinstance(screen, AccountsHarlequinScreen):
             return
         try:
             filter_input = self.query_one(FILTER_INPUT_ID, Input)
@@ -1567,8 +1615,12 @@ class AccountsTextualApp(  # pragma: no cover - interactive
         UX note: helps users reset the list without leaving the TUI.
         """
         # Skip if Harlequin screen is active (it handles its own exit)
-        if isinstance(self.screen, AccountsHarlequinScreen):
-            self.exit()
+        try:
+            screen = self.screen
+        except Exception:
+            screen = None
+        if isinstance(screen, AccountsHarlequinScreen):
+            self._safe_exit()
             return
         try:
             filter_input = self.query_one(FILTER_INPUT_ID, Input)
@@ -1578,7 +1630,7 @@ class AccountsTextualApp(  # pragma: no cover - interactive
                     self._clear_filter()
                     self._reload_rows()
                 try:
-                    table = self.query_one(ACCOUNTS_TABLE_ID, DataTable)
+                    table = self.query_one(ACCOUNTS_TABLE_ID)
                     table.focus()
                 except Exception:
                     pass
@@ -1586,11 +1638,17 @@ class AccountsTextualApp(  # pragma: no cover - interactive
         except Exception:
             # Filter input doesn't exist, just exit
             pass
-        self.exit()
+        self._safe_exit()
 
     def action_app_exit(self) -> None:
         """Exit the application regardless of focus state."""
-        self.exit()
+        self._safe_exit()
+
+    def _safe_exit(self) -> None:
+        try:
+            self.exit()
+        except AttributeError:
+            return
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         """Handle filter bar buttons."""
@@ -1836,7 +1894,11 @@ class AccountsTextualApp(  # pragma: no cover - interactive
     def _update_filter_button_visibility(self) -> None:
         """Show clear button only when filter has content."""
         # Skip if Harlequin screen is active (it doesn't have this button)
-        if isinstance(self.screen, AccountsHarlequinScreen):
+        try:
+            screen = self.screen
+        except Exception:
+            screen = None
+        if isinstance(screen, AccountsHarlequinScreen):
             return
         try:
             filter_input = self.query_one(FILTER_INPUT_ID, Input)