Merge pull request #193 from Maxteabag/worktree-issue-188-clipboard

Maxteabag · web-flow · commit eb286c84676b · 2026-05-14T18:58:00.000+02:00
diff --git a/sqlit/domains/query/ui/mixins/query_editing_clipboard.py b/sqlit/domains/query/ui/mixins/query_editing_clipboard.py
@@ -71,11 +71,15 @@ def action_copy_selection(self: QueryMixinHost) -> None:
 
     def action_paste(self: QueryMixinHost) -> None:
         """Paste text from clipboard (CTRL+V)."""
+        clipboard = self._get_clipboard_text()
+        self._paste_text(clipboard)
+
+    def _paste_text(self: QueryMixinHost, clipboard: str) -> None:
+        """Paste provided text at the query cursor."""
         from textual.widgets.text_area import Selection
 
         from sqlit.domains.query.editing import paste_text
 
-        clipboard = self._get_clipboard_text()
         if not clipboard:
             return
 
@@ -104,10 +108,13 @@ def action_paste(self: QueryMixinHost) -> None:
         cursor = self.query_input.cursor_location
         self.query_input.selection = Selection(cursor, cursor)
 
-    def _get_clipboard_text(self: QueryMixinHost) -> str:
+    def _get_clipboard_text(self: QueryMixinHost, prefer_internal: bool = False) -> str:
         """Get text from system clipboard."""
-        try:
-            import pyperclip  # pyright: ignore[reportMissingModuleSource]
-            return pyperclip.paste() or ""
-        except Exception:
-            return ""
+        from sqlit.shared.ui.clipboard import get_system_clipboard_text
+
+        internal = getattr(self, "_internal_clipboard", "") or ""
+
+        if prefer_internal and internal:
+            return internal
+
+        return get_system_clipboard_text() or internal
diff --git a/sqlit/domains/results/ui/mixins/results.py b/sqlit/domains/results/ui/mixins/results.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Any
 
 from sqlit.shared.ui.protocols import ResultsMixinHost
@@ -112,9 +111,9 @@ async def work_async() -> None:
     def _normalize_column_name(self: ResultsMixinHost, name: str) -> str:
         trimmed = name.strip()
         if len(trimmed) >= 2:
-            if trimmed[0] == trimmed[-1] and trimmed[0] in ("\"", "`"):
-                trimmed = trimmed[1:-1]
-            elif trimmed[0] == "[" and trimmed[-1] == "]":
+            if (trimmed[0] == trimmed[-1] and trimmed[0] in ("\"", "`")) or (
+                trimmed[0] == "[" and trimmed[-1] == "]"
+            ):
                 trimmed = trimmed[1:-1]
         if "." in trimmed and not any(q in trimmed for q in ("\"", "`", "[")):
             trimmed = trimmed.split(".")[-1]
@@ -139,33 +138,20 @@ def _get_active_results_table_info(
 
     def _copy_text(self: ResultsMixinHost, text: str) -> bool:
         """Copy text to clipboard if possible, otherwise store internally."""
-        self._internal_clipboard = text
+        from sqlit.shared.ui.clipboard import copy_to_system_clipboard
 
-        if sys.platform == "darwin":
-            # Prefer pyperclip on macOS; Textual's copy_to_clipboard can no-op.
-            try:
-                import pyperclip  # type: ignore
+        self._internal_clipboard = text
 
-                pyperclip.copy(text)
-                return True
-            except Exception:
-                pass
+        system_copied = copy_to_system_clipboard(text)
 
-        # Prefer Textual's clipboard support (OSC52 where available).
+        # Textual uses OSC52. It helps in terminals that support local clipboard
+        # writes, including some remote sessions where OS commands target the
+        # wrong machine.
         try:
             self.copy_to_clipboard(text)
             return True
         except Exception:
-            pass
-
-        # Fallback to system clipboard via pyperclip (requires platform support).
-        try:
-            import pyperclip  # type: ignore
-
-            pyperclip.copy(text)
-            return True
-        except Exception:
-            return False
+            return system_copied
 
     def _get_active_results_context(
         self: ResultsMixinHost,
diff --git a/sqlit/shared/ui/clipboard.py b/sqlit/shared/ui/clipboard.py
@@ -0,0 +1,165 @@
+"""System clipboard helpers.
+
+Terminal clipboard access is platform and terminal dependent. These helpers try
+native OS commands first, then pyperclip, and leave terminal-mediated OSC52 to
+the caller because Textual owns the active driver.
+"""
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import sys
+from importlib import import_module
+from typing import Any
+
+CLIPBOARD_TIMEOUT_S = 1.5
+
+
+def get_system_clipboard_text() -> str:
+    """Return text from the system clipboard, or an empty string if unavailable."""
+    text = _get_with_native_command()
+    if text is not None:
+        return text
+
+    try:
+        pyperclip = _load_pyperclip()
+        return pyperclip.paste() or ""
+    except Exception:
+        return ""
+
+
+def copy_to_system_clipboard(text: str) -> bool:
+    """Copy text to the system clipboard using the best available backend."""
+    if _copy_with_native_command(text):
+        return True
+
+    try:
+        pyperclip = _load_pyperclip()
+        pyperclip.copy(text)
+        return True
+    except Exception:
+        return False
+
+
+def _load_pyperclip() -> Any:
+    return import_module("pyperclip")
+
+
+def _get_with_native_command() -> str | None:
+    if sys.platform == "darwin":
+        return _run_text_output_command(["pbpaste"])
+
+    if sys.platform == "win32":
+        command = _powershell_command()
+        if command:
+            return _run_text_output_command(command + ["Get-Clipboard", "-Raw"])
+        return None
+
+    for command in _linux_paste_commands():
+        text = _run_text_output_command(command)
+        if text is not None:
+            return text
+
+    return None
+
+
+def _copy_with_native_command(text: str) -> bool:
+    if sys.platform == "darwin":
+        return _run_text_input_command(["pbcopy"], text)
+
+    if sys.platform == "win32":
+        command = _powershell_command()
+        if command and _run_text_input_command(command + ["Set-Clipboard -Value ([Console]::In.ReadToEnd())"], text):
+            return True
+        return _run_text_input_command(["clip.exe"], text)
+
+    return any(_run_text_input_command(command, text) for command in _linux_copy_commands())
+
+
+def _linux_paste_commands() -> list[list[str]]:
+    commands: list[list[str]] = []
+    if os.environ.get("WAYLAND_DISPLAY"):
+        commands.append(["wl-paste", "--type", "text"])
+    if os.environ.get("DISPLAY"):
+        commands.extend(
+            [
+                ["xclip", "-selection", "clipboard", "-out"],
+                ["xsel", "--clipboard", "--output"],
+            ]
+        )
+    if not commands:
+        commands.extend(
+            [
+                ["wl-paste", "--type", "text"],
+                ["xclip", "-selection", "clipboard", "-out"],
+                ["xsel", "--clipboard", "--output"],
+            ]
+        )
+    return commands
+
+
+def _linux_copy_commands() -> list[list[str]]:
+    commands: list[list[str]] = []
+    if os.environ.get("WAYLAND_DISPLAY"):
+        commands.append(["wl-copy", "--type", "text/plain"])
+    if os.environ.get("DISPLAY"):
+        commands.extend(
+            [
+                ["xclip", "-selection", "clipboard"],
+                ["xsel", "--clipboard", "--input"],
+            ]
+        )
+    if not commands:
+        commands.extend(
+            [
+                ["wl-copy", "--type", "text/plain"],
+                ["xclip", "-selection", "clipboard"],
+                ["xsel", "--clipboard", "--input"],
+            ]
+        )
+    return commands
+
+
+def _powershell_command() -> list[str] | None:
+    for executable in ("pwsh", "powershell.exe", "powershell"):
+        if shutil.which(executable):
+            return [executable, "-NoProfile", "-NonInteractive", "-Command"]
+    return None
+
+
+def _run_text_output_command(command: list[str]) -> str | None:
+    if not shutil.which(command[0]):
+        return None
+    try:
+        completed = subprocess.run(
+            command,
+            capture_output=True,
+            check=False,
+            text=True,
+            timeout=CLIPBOARD_TIMEOUT_S,
+        )
+    except Exception:
+        return None
+    if completed.returncode != 0:
+        return None
+    return completed.stdout
+
+
+def _run_text_input_command(command: list[str], text: str) -> bool:
+    if not shutil.which(command[0]):
+        return False
+    try:
+        completed = subprocess.run(
+            command,
+            check=False,
+            input=text,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            text=True,
+            timeout=CLIPBOARD_TIMEOUT_S,
+        )
+    except Exception:
+        return False
+    return completed.returncode == 0
diff --git a/sqlit/shared/ui/protocols/query.py b/sqlit/shared/ui/protocols/query.py
@@ -120,7 +120,10 @@ def _show_char_pending_menu(self, motion: str) -> None:
     def _show_text_object_menu(self, mode: str) -> None:
         ...
 
-    def _get_clipboard_text(self) -> str:
+    def _get_clipboard_text(self, prefer_internal: bool = False) -> str:
+        ...
+
+    def _paste_text(self, clipboard: str) -> None:
         ...
 
     def _get_undo_history(self) -> Any:
diff --git a/sqlit/shared/ui/widgets_text_area.py b/sqlit/shared/ui/widgets_text_area.py
@@ -6,9 +6,10 @@
 
 from rich.segment import Segment
 from textual.color import Color
-from textual.events import Key
+from textual.events import Key, Paste
 from textual.strip import Strip
 from textual.widgets import TextArea
+from textual.widgets.text_area import Selection
 
 if TYPE_CHECKING:
     from sqlit.shared.ui.protocols import AutocompleteProtocol
@@ -117,7 +118,7 @@ def sync_terminal_cursor(self) -> None:
         self._sync_terminal_cursor()
 
     @property
-    def _draw_cursor(self) -> bool:  # type: ignore[override]
+    def _draw_cursor(self) -> bool:
         if self._should_use_terminal_cursor():
             return False
         return super()._draw_cursor
@@ -200,6 +201,23 @@ async def _on_key(self, event: Key) -> None:
         # For all other keys, use default TextArea behavior
         await super()._on_key(event)
 
+    async def _on_paste(self, event: Paste) -> None:
+        """Handle terminal-delivered paste text explicitly."""
+        if not self._is_insert_mode():
+            event.prevent_default()
+            event.stop()
+            return
+
+        self._push_undo_if_changed()
+        paste_text = getattr(self.app, "_paste_text", None)
+        if callable(paste_text):
+            paste_text(event.text)
+            event.prevent_default()
+            event.stop()
+            return
+
+        await super()._on_paste(event)
+
     def _is_visual_mode(self) -> bool:
         """Check if app is in any vim visual mode."""
         from sqlit.core.vim import VimMode
@@ -266,9 +284,9 @@ def relative_line_numbers(self, value: bool) -> None:
             self._line_cache.clear()
             self.refresh()
 
-    def _watch_selection(self, previous_selection: object, selection: object) -> None:
+    def _watch_selection(self, previous_selection: Selection, selection: Selection) -> None:
         """Clear line cache when cursor row changes (for relative line numbers)."""
-        super()._watch_selection(previous_selection, selection)  # type: ignore[arg-type]
+        super()._watch_selection(previous_selection, selection)
         if self._relative_line_numbers and self.show_line_numbers:
             # Get current cursor row
             cursor_row = self.selection.end[0]
diff --git a/tests/ui/keybindings/test_visual_mode.py b/tests/ui/keybindings/test_visual_mode.py
@@ -314,6 +314,51 @@ async def test_visual_yank(self) -> None:
             # Text should be unchanged
             assert app.query_input.text == "hello world"
 
+    @pytest.mark.asyncio
+    async def test_normal_p_uses_internal_clipboard_when_system_clipboard_unavailable(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        app = _make_app()
+
+        monkeypatch.setattr("sqlit.shared.ui.clipboard.get_system_clipboard_text", lambda: "")
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            app.action_focus_query()
+            await pilot.pause()
+
+            app.query_input.text = "SELECT * FROM users"
+            app.query_input.cursor_location = (0, len(app.query_input.text))
+            app._internal_clipboard = " WHERE id = 1"
+            await pilot.pause()
+
+            await pilot.press("p")
+            await pilot.pause()
+
+            assert app.query_input.text == "SELECT * FROM users WHERE id = 1"
+
+    @pytest.mark.asyncio
+    async def test_normal_p_prefers_system_clipboard(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        app = _make_app()
+
+        monkeypatch.setattr(
+            "sqlit.shared.ui.clipboard.get_system_clipboard_text",
+            lambda: " WHERE active = true",
+        )
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            app.action_focus_query()
+            await pilot.pause()
+
+            app.query_input.text = "SELECT * FROM users"
+            app.query_input.cursor_location = (0, len(app.query_input.text))
+            app._internal_clipboard = " WHERE id = 1"
+            await pilot.pause()
+
+            await pilot.press("p")
+            await pilot.pause()
+
+            assert app.query_input.text == "SELECT * FROM users WHERE active = true"
+
     @pytest.mark.asyncio
     async def test_visual_delete(self) -> None:
         app = _make_app()
diff --git a/tests/unit/test_clipboard.py b/tests/unit/test_clipboard.py
