Merge main app updates

Author: Maxteabag

sqlit/domains/shell/app/main.py

@@ -98,13 +98,15 @@ def __init__(
         services: AppServices | None = None,
         runtime: RuntimeConfig | None = None,
         startup_connection: ConnectionConfig | None = None,
+        exclusive_connection: bool = False,
     ):
         super().__init__()
         self.services = services or build_app_services(runtime or RuntimeConfig.from_env())
         from sqlit.core.connection_manager import ConnectionManager
 
         self._connection_manager = ConnectionManager(self.services)
         self._startup_connection = startup_connection
+        self._exclusive_connection = exclusive_connection
         self._startup_connect_config: ConnectionConfig | None = None
         self._debug_mode = self.services.runtime.debug_mode
         self._debug_idle_scheduler = self.services.runtime.debug_idle_scheduler
@@ -161,6 +163,7 @@ def __init__(
         self._query_handle: Any | None = None
         self._command_mode: bool = False
         self._command_buffer: str = ""
+        self._count_buffer: str = ""  # Vim count prefix (e.g., "3" for 3j)
         self._ui_stall_watchdog_timer: Timer | None = None
         self._ui_stall_watchdog_expected: float | None = None
         self._ui_stall_watchdog_interval_s: float = 0.0
@@ -299,6 +302,7 @@ def _get_input_context(self) -> InputContext:
             last_result_is_error=last_result_is_error,
             has_results=has_results,
             stacked_result_count=stacked_result_count,
+            count_buffer=self._count_buffer,
         )
 
     def _debug_screen_label(self, screen: Any | None) -> str:
@@ -425,6 +429,10 @@ def on_key(self, event: Key) -> None:
         if self._handle_command_input(event, ctx):
             return
 
+        # Handle count digit accumulation (e.g., 3j, 10k)
+        if self._handle_count_digit(event, ctx):
+            return
+
         action = resolve_action(
             event.key,
             ctx,
@@ -500,6 +508,61 @@ def _exit_command_mode(self) -> None:
         self._command_buffer = ""
         self._update_status_bar()
 
+    # ========================================================================
+    # Vim count prefix support
+    # ========================================================================
+
+    def _get_and_clear_count(self) -> int | None:
+        """Get the current count prefix and clear it. Returns None if no count."""
+        if not self._count_buffer:
+            return None
+        try:
+            count = int(self._count_buffer)
+            # Cap at 9999 for safety
+            count = min(count, 9999)
+        except ValueError:
+            count = None
+        self._count_buffer = ""
+        return count
+
+    def _append_count_digit(self, digit: str) -> None:
+        """Append a digit to the count buffer."""
+        if len(self._count_buffer) < 4:  # Max 4 digits (9999)
+            self._count_buffer += digit
+
+    def _clear_count_buffer(self) -> None:
+        """Clear the count buffer."""
+        self._count_buffer = ""
+
+    def _handle_count_digit(self, event: Key, ctx: InputContext) -> bool:
+        """Handle digit keys for count prefix accumulation.
+
+        Returns True if the digit was consumed as a count prefix.
+        """
+        from sqlit.core.vim import VimMode
+
+        # Only in NORMAL mode with query focus
+        if ctx.focus != "query" or self.vim_mode != VimMode.NORMAL:
+            return False
+
+        # Don't intercept digits during leader pending
+        if ctx.leader_pending:
+            return False
+
+        char = event.character
+        if not char or not char.isdigit():
+            return False
+
+        # '0' only appends if count already started (otherwise it's line-start motion)
+        if char == "0" and not self._count_buffer:
+            return False
+
+        # Digits 1-9 always start/continue count
+        self._append_count_digit(char)
+        event.prevent_default()
+        event.stop()
+        return True
+
     def _handle_command_input(self, event: Key, ctx: InputContext) -> bool:
         from sqlit.core.vim import VimMode
 
@@ -547,6 +610,12 @@ def _run_command(self, command: str) -> None:
         normalized = command.strip()
         self._last_command = normalized
         self._last_command_at = time.perf_counter()
+
+        # Handle go-to-line command (e.g., :25 goes to line 25)
+        if normalized.isdigit():
+            self._goto_line(int(normalized))
+            return
+
         cmd, *args = normalized.split()
         cmd = cmd.lower()
 
@@ -590,6 +659,19 @@ def _run_command(self, command: str) -> None:
         if cmd == "set" and args:
             target = args[0].lower().replace("-", "_")
             value = args[1].lower() if len(args) > 1 else ""
+            # Line number settings (vim-style)
+            if target in {"number", "nu"}:
+                self._set_line_numbers(True)
+                return
+            if target in {"nonumber", "nonu"}:
+                self._set_line_numbers(False)
+                return
+            if target in {"relativenumber", "rnu"}:
+                self._set_relative_line_numbers(True)
+                return
+            if target in {"norelativenumber", "nornu"}:
+                self._set_relative_line_numbers(False)
+                return
             if target in {"process_worker"}:
                 if not value:
                     self._execute_command_action("toggle_process_worker")
@@ -666,14 +748,25 @@ def _show_command_list(self) -> None:
                 "Use 'plaintext' to store passwords in ~/.sqlit/ (protected folder), 'keyring' to use system keyring.",
             ),
             ("Appearance", ":theme", "Open theme selection", ""),
-            (
-                "Query",
-                ":alert off|delete|write",
-                "Confirm before risky queries",
-                "Modes: off, delete, write",
-            ),
+            ("Query", ":alert off|delete|write", "Confirm before risky queries", "Modes: off, delete, write"),
             ("Query", ":run, :r", "Execute query", ""),
             ("Query", ":run!, :r!", "Execute query (stay in INSERT)", ""),
+            (
+                "Navigation",
+                ":<number>",
+                "Go to line number",
+                "Jump to specified line in query editor (e.g., :25 goes to line 25).",
+            ),
+            (
+                "Navigation",
+                "<count>G",
+                "Go to line with count prefix",
+                "In NORMAL mode, type a number then G to go to that line (e.g., 25G).",
+            ),
+            ("Editor", ":set number, :set nu", "Show line numbers", ""),
+            ("Editor", ":set nonumber, :set nonu", "Hide line numbers", ""),
+            ("Editor", ":set relativenumber, :set rnu", "Show relative line numbers", ""),
+            ("Editor", ":set norelativenumber, :set nornu", "Show absolute line numbers", ""),
             (
                 "Worker",
                 ":process-worker, :worker",
@@ -686,6 +779,9 @@ def _show_command_list(self) -> None:
                 "Show process worker status",
                 "Displays worker mode, active state, and last activity.",
             ),
+            ("Settings", ":set process_worker_warm on|off", "Warm worker on idle", ""),
+            ("Settings", ":set process_worker_lazy on|off", "Lazy worker start", ""),
+            ("Settings", ":set process_worker_auto_shutdown <seconds>", "Auto-shutdown worker", ""),
             (
                 "Watchdog",
                 ":wd <ms|off>",
@@ -703,9 +799,6 @@ def _show_command_list(self) -> None:
             ("Debug", ":debug", "Show debug status", ""),
             ("Debug", ":debug list", "Show debug events", ""),
             ("Debug", ":debug clear", "Clear debug event log", ""),
-            ("Settings", ":set process_worker_warm on|off", "Warm worker on idle", ""),
-            ("Settings", ":set process_worker_lazy on|off", "Lazy worker start", ""),
-            ("Settings", ":set process_worker_auto_shutdown <seconds>", "Auto-shutdown worker", ""),
         ]
         if hasattr(self, "_replace_results_table"):
             self._replace_results_table(columns, rows)
@@ -824,6 +917,48 @@ def _set_process_worker(self, enabled: bool) -> None:
         state = "enabled" if enabled else "disabled"
         self.notify(f"Process worker {state}")
 
+    def _goto_line(self, line_number: int) -> None:
+        """Go to a specific line number (1-indexed)."""
+        try:
+            lines = self.query_input.text.split("\n")
+            num_lines = len(lines)
+            # Convert to 0-indexed and clamp
+            target_row = min(line_number - 1, num_lines - 1)
+            target_row = max(0, target_row)
+            self.query_input.cursor_location = (target_row, 0)
+            self.query_input.focus()
+        except Exception:
+            pass
+
+    def _set_line_numbers(self, enabled: bool) -> None:
+        """Enable or disable line numbers in the query editor."""
+        try:
+            self.query_input.show_line_numbers = enabled
+        except Exception:
+            pass
+        try:
+            self.services.settings_store.set("show_line_numbers", enabled)
+        except Exception:
+            pass
+        state = "enabled" if enabled else "disabled"
+        self.notify(f"Line numbers {state}")
+
+    def _set_relative_line_numbers(self, enabled: bool) -> None:
+        """Enable or disable relative line numbers in the query editor."""
+        try:
+            self.query_input.relative_line_numbers = enabled
+            # Also ensure line numbers are visible when enabling relative
+            if enabled and not self.query_input.show_line_numbers:
+                self.query_input.show_line_numbers = True
+        except Exception:
+            pass
+        try:
+            self.services.settings_store.set("relative_line_numbers", enabled)
+        except Exception:
+            pass
+        state = "enabled" if enabled else "disabled"
+        self.notify(f"Relative line numbers {state}")
+
     def _set_process_worker_warm_on_idle(self, enabled: bool) -> None:
         self.services.runtime.process_worker_warm_on_idle = enabled
         try: