[#24193] Applied revision

Signed-off-by: danipiza <dpizarrogallego@gmail.com>

Author: Danipiza

src/vulcanai/console/console.py

@@ -30,19 +30,12 @@
 
 from vulcanai.console.logger import VulcanAILogger
 from vulcanai.console.modal_screens import CheckListModal, RadioListModal, ReverseSearchModal
+from vulcanai.console.terminal_session import TerminalSession, TerminalSessionConfig
 from vulcanai.console.utils import (
     SpinnerHook,
     StreamToTextual,
     attach_ros_logger_to_console,
     common_prefix,
-    # disable_gnome_scrollbar,
-    # restore_gnome_scrollbar,
-    # write_terminal_sequence,
-)
-from vulcanai.console.TerminalSession import (
-    GnomeTerminalAdapter,
-    TerminalSession,
-    TerminalSessionConfig,
 )
 from vulcanai.console.widget_custom_log_text_area import CustomLogTextArea
 from vulcanai.console.widget_spinner import SpinnerStatus
@@ -59,79 +52,72 @@ def write(self, msg: str, color: str = "") -> None:
 
 
 class VulcanConsole(App):
-    _vulcanai_bg_color = "#121212"
-
     # CSS Styles
     # Two panels: left (log + input) and right (history + variables)
     #   Right panel: 48 characters length
     #   Left panel: fills remaining space
-    CSS = f"""
-    Screen {{
+    CSS = """
+    Screen {
         layout: horizontal;
-        background: {_vulcanai_bg_color};
         overflow: hidden hidden;
-    }}
+    }
 
-    #root {{
+    #root {
         width: 100%;
         height: 100%;
-        background: {_vulcanai_bg_color};
         overflow: hidden hidden;
-    }}
+    }
 
-    #left {{
+    #left {
         width: 1fr;
         layout: vertical;
-        background: {_vulcanai_bg_color};
         overflow: hidden hidden;
-    }}
+    }
 
-    #right {{
+    #right {
         width: 48;
         layout: vertical;
         border: tall #56AA08;
         padding: 0;
-        background: {_vulcanai_bg_color};
         overflow: hidden hidden;
-    }}
+    }
 
-    #logcontent {{
+    #logcontent {
         height: auto;
         min-height: 1;
         max-height: 1fr;
         border: tall #333333;
-        background: {_vulcanai_bg_color};
         scrollbar-size-vertical: 0;
         scrollbar-size-horizontal: 0;
-    }}
+    }
 
-    #llm_spinner {{
+    #llm_spinner {
         height: 0;
         display: none;
         content-align: left middle;
         padding-left: 2;
-    }}
+    }
 
-    #cmd {{
+    #cmd {
         dock: bottom;
-    }}
+    }
 
-    #history_title {{
+    #history_title {
         content-align: center middle;
         margin: 0;
         padding: 0;
-    }}
+    }
 
-    #history_scroll {{
+    #history_scroll {
         height: 1fr;
         margin: 1;
         scrollbar-size-vertical: 0;
         scrollbar-size-horizontal: 0;
-    }}
+    }
 
-    #history {{
+    #history {
         width: 100%;
-    }}
+    }
     """
 
     # Bindings for the console
@@ -1113,8 +1099,7 @@ def run_console(self) -> None:
         """
 
         session = TerminalSession(
-            adapters=[GnomeTerminalAdapter()],
-            config=TerminalSessionConfig(bg_color=self._vulcanai_bg_color),
+            config=TerminalSessionConfig(),
         )
         with session:
             self.run()

src/vulcanai/console/TerminalSession.py src/vulcanai/console/terminal_session.pysrc/vulcanai/console/TerminalSession.py renamed to src/vulcanai/console/terminal_session.py

@@ -1,8 +1,22 @@
-from typing import Any, Protocol, Optional, List
-from dataclasses import dataclass
+# Copyright 2026 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import os
 import subprocess
 import sys
+from dataclasses import dataclass
+from typing import Any, Optional, Protocol
 
 
 def write_terminal_sequence(sequence: str) -> None:
@@ -19,25 +33,14 @@ def write_terminal_sequence(sequence: str) -> None:
         sys.stdout.write(sequence)
         sys.stdout.flush()
     except Exception:
-        # best-effort: ignore
         pass
 
 
 class TerminalAdapter(Protocol):
     """
-    Protocol implemented by terminal-specific adapters.
-
-    Parent class for each terminal adapter.
-    Done:
-    - GNOME
-
-    TODO:
-    - Terminator
-    - Zsh
-    - Kitty
-    - XTerm
-    - Alackritty
-    - Alacritty
+    Abstract parent class to enhance VulcanAI visualization in each terminal.
+    Currently supported: Gnome
+    Not yet implemented: Terminator, Zsh
     """
 
     name: str
@@ -48,9 +51,11 @@ def apply(self) -> Any: ...
 
     def restore(self, state: Any) -> None: ...
 
+
 # region TERMINALS
 
-    # region gnome
+# region gnome
+
 
 def _run_gsettings(*args: str) -> Optional[str]:
     """
@@ -90,19 +95,19 @@ def detect(self) -> bool:
         @brief Detect whether the current terminal is GNOME Terminal.
         @return ``True`` when GNOME Terminal environment markers are found.
         """
-        terminal_emulator = os.environ.get("TERMINAL_EMULATOR", "").lower()
-        term_program = os.environ.get("TERM_PROGRAM", "").lower()
-        return (
-            "gnome-terminal" in terminal_emulator
-            or "gnome-terminal" in term_program
-            or "GNOME_TERMINAL_SCREEN" in os.environ
+        is_gnome = (
+            "GNOME_TERMINAL_SCREEN" in os.environ
+            or "gnome-terminal" in os.environ.get("TERMINAL_EMULATOR", "").lower()
+            or "gnome-terminal" in os.environ.get("TERM_PROGRAM", "").lower()
         )
+        return is_gnome
 
     def apply(self) -> Optional[GnomeState]:
         """
         @brief Hide GNOME scrollbar and return state for later restoration.
         @return ``GnomeState`` when the change is applied/confirmed, else ``None``.
         """
+        # The return value could be None, empty string or string with just single quotes
         profile_id = _run_gsettings("get", "org.gnome.Terminal.ProfilesList", "default")
         if not profile_id:
             return None
@@ -137,17 +142,20 @@ def restore(self, state: Optional[GnomeState]) -> None:
     # endregion
 
     # region TERMINATOR
+
+
 # TODO
-    # endregion
+# endregion
 
-    # region ZSH
+# region ZSH
 # TODO
-    # endregion
+# endregion
 
 # endregion
 
 # region SESSION
 
+
 @dataclass
 class TerminalSessionConfig:
     """@brief Runtime options controlling generic terminal tweaks."""
@@ -165,11 +173,8 @@ class TerminalSession:
     Session helper that applies terminal tweaks and safely restores them.
     """
 
-    def __init__(self, adapters: List[TerminalAdapter], config: TerminalSessionConfig):
-        """
-        Build a terminal session with a list of adapters.
-        """
-        self.adapters = adapters
+    def __init__(self, config: TerminalSessionConfig):
+        self.adapters = [GnomeTerminalAdapter()]
         self.config = config
         self._active: list[tuple[TerminalAdapter, Any]] = []
 
@@ -225,4 +230,5 @@ def __exit__(self, exc_type, exc, tb):
         self.end()
         return False
 
-# endregion
+
+# endregion

src/vulcanai/console/utils.py

@@ -16,7 +16,6 @@
 import asyncio
 import difflib
 import heapq
-import os
 import subprocess
 import sys
 import threading
@@ -361,114 +360,3 @@ def _get_suggestions(real_string_list_comp: list[str], string_comp: str) -> tupl
 
 
 # endregion
-
-# region TERMINAL_CONFIG
-
-
-def write_terminal_sequence(console, sequence: str) -> None:
-    """
-    Send terminal control sequence if stdout is a teletypewriter (TTY).
-    Used for OSC / CSI compatibility tweaks.
-
-    OSC: Operating System Command
-    CSI: Control Sequence Introducer
-    """
-    if not sys.stdout.isatty():
-        return
-
-    try:
-        sys.stdout.write(sequence)
-        sys.stdout.flush()
-    except Exception as e:
-        console.logger.log_msg(f"[error] Unsupported terminal: {e}[/error]")
-
-
-def is_gnome_terminal() -> bool:
-    """
-    Return True when running inside GNOME Terminal.
-    """
-    is_gnome = "GNOME_TERMINAL_SCREEN" in os.environ or \
-                "gnome-terminal" in os.environ.get("TERMINAL_EMULATOR", "").lower() or \
-                "gnome-terminal" in os.environ.get("TERM_PROGRAM", "").lower()
-    return is_gnome
-
-
-def run_gsettings(*args: str) -> str | None:
-    """
-    Run a gsettings command and return stdout or None on failure.
-    """
-
-    try:
-        completed = subprocess.run(
-            ["gsettings", *args],
-            check=False,
-            capture_output=True,
-            text=True,
-        )
-    except Exception:
-        return None
-
-    if completed.returncode != 0:
-        return None
-
-    return completed.stdout.strip()
-
-
-def disable_gnome_scrollbar(console) -> None:
-    """
-    Temporarily set the active GNOME Terminal profile scrollbar policy to ``never``.
-
-    The function is intentionally best-effort:
-    - It does nothing outside GNOME Terminal.
-    - It does nothing if ``gsettings`` queries fail.
-    - It stores the original profile schema and scrollbar policy on ``console`` so
-      ``restore_gnome_scrollbar()`` can revert the change when the session ends.
-    """
-
-    if not is_gnome_terminal():
-        return
-
-    # GNOME returns quoted strings (for example: "'<profile-id>'").
-    profile_id = run_gsettings("get", "org.gnome.Terminal.ProfilesList", "default")
-    if not profile_id:
-        return
-    profile_id = profile_id.strip("'")
-    if not profile_id:
-        return
-
-    # Build the profile-specific schema path used by GNOME Terminal settings.
-    schema = f"org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:{profile_id}/"
-    current_policy = run_gsettings("get", schema, "scrollbar-policy")
-    if not current_policy:
-        return
-
-    console._gnome_profile_schema = schema
-    console._gnome_scrollbar_policy_backup = current_policy
-
-    if current_policy != "'never'":
-        run_gsettings("set", schema, "scrollbar-policy", "never")
-
-
-def restore_gnome_scrollbar(console) -> None:
-    """
-    Restore the GNOME Terminal scrollbar policy saved by
-    ``disable_gnome_scrollbar()``.
-
-    If no backup values were saved, this function is a no-op.
-    """
-    if not getattr(console, "_gnome_profile_schema", None) or not getattr(
-        console, "_gnome_scrollbar_policy_backup", None):
-        return
-
-    # gsettings expects the enum token without shell-style quotes.
-    restore_value = console._gnome_scrollbar_policy_backup.strip("'")
-    if restore_value:
-        run_gsettings(
-            "set",
-            console._gnome_profile_schema,
-            "scrollbar-policy",
-            restore_value,
-        )
-
-
-# endregion