legion-tty 0.4.42 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544115343036952adfc2f3accc8ce189ec8bb13c06f04ce383d0536549118e49
-  data.tar.gz: 806f22df6bed2c34ce6c47c6eab8c1af6bb611cc458db878087a86163f7e0248
+  metadata.gz: c79bfc84ae3c3bc48ae055db72296b3aec2ab24c9a86dba5d7604e5732a3503e
+  data.tar.gz: 96cb9a58135228887222a4fcc6064209ae1e825fad949c0cbd143c40c5249ed7
 SHA512:
-  metadata.gz: 4a90450fe8ba541b1823f43cfc89eb97ed2ef6185029afffc022771c87f8909583fab80715098789240b8bab4ee3c8c2ae240987dc9630352c76d89ee3acad6a
-  data.tar.gz: '0667478fd7867da23c0c5f4a83fdeac3056cc97ff18a2bf1dbe0c447f4a29088b0e1d6aafeb6d9b19ffc8a1784b4cd80f1a94a2d9ea5a2563fca063004020ee5'
+  metadata.gz: ea7ed87c3baffa35d8e02852ce301c532e0aef8deab17a40892db373abd7f82ac49ae60f22a88e4ea66e90f3d56996db0850cef8e8e09ffd743f8e0a924ff0e3
+  data.tar.gz: dd2e68abefc811eface7a9db9c7c2014bccf433d7b859b42068746fc952afdbcc4470ec41e761a0d86df40236bb2aebeb334afddcbe278be06fe9acb78f6715f

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.5.1] - 2026-04-18
+
+### Fixed
+- **Alternate screen buffer** — `App#run_loop` now enables `\e[?1049h` on startup and `\e[?1049l` on shutdown so the TUI no longer pollutes shell scrollback and the prior shell session is restored on exit (closes #20)
+- **Mouse wheel scroll** — enabled SGR mouse tracking (`\e[?1000h` + `\e[?1006h`) and routed wheel-up/wheel-down events to `MessageStream#scroll_up` / `#scroll_down` with 3-line increments (closes #20)
+- **Vim-style scroll bindings** — added `Ctrl+B` (half-page up) and `Ctrl+F` (half-page down) on the Chat screen; wired `Home` / `End` to jump-to-top / jump-to-bottom when the input bar is empty (closes #20)
+- **Scroll hint in status bar** — `scroll_segment` now shows directional arrows (`↑↓ scroll` or `↑ scroll`) alongside the position counter when content overflows the viewport (closes #20)
+- **Help text updated** — added scroll binding reference line to the help overlay
+
+## [0.5.0] - 2026-04-17
+
+### Added
+- **`Legion::Tools::Registry` integration** — `/tools` now queries `Legion::Tools::Registry.all_tools` to display registered tool names, descriptions, MCP tiers, and deferred status; falls back to gem scan when Registry is unavailable (closes #15)
+- **`/tool <name> [json-args]`** — new slash command to invoke any registered tool directly from chat; tries local Registry first, falls back to `DaemonClient.run_tool` (closes #15)
+- **Tool schemas in inference** — `build_tool_schemas` passes always-loaded tool schemas to every `DaemonClient.inference` call so the LLM can use registered tools (closes #15)
+- **TriggerIndex intent routing** — when `Legion::Tools::TriggerIndex` is non-empty and a user message matches a registered trigger word, routes to `Legion::Tools::Do.call` directly without an LLM round-trip (closes #15)
+- **`DaemonClient.run_tool`** — new method: `POST /api/tools/run`; returns `{status: :ok/:error/:unavailable}` (closes #15)
+- **`/skills`** — new slash command: lists all registered `Legion::LLM::Skills` with namespace, trigger type, trigger words, and description (closes #16)
+- **`/skills load <path>`** — loads a `.md` skill file at runtime via `Legion::LLM::Skills::DiskLoader` (closes #16)
+- **`/skills run <namespace>:<name>`** — invokes a registered skill and shows its injected content (closes #16)
+- **`/apollo query/ingest/graph/status/autoingest`** — new slash command family for the `Legion::Apollo` knowledge store: semantic query with confidence-ranked results, content ingestion, graph traversal by entity ID, and live status (closes #17)
+- **Apollo dashboard panel** — System Info panel on the dashboard now shows `Apollo: started/transport/data` availability (closes #17)
+- **`Legion::TTY::NotificationGate`** — new module wrapping `Legion::Gaia::NotificationGate`; `status_bar.notify` now gates `info`/`success`/`warning` notifications through Gaia's presence, behavioral, and schedule evaluators; `error` level always delivers (closes #18)
+- **`/gaia status`** — shows Gaia NotificationGate evaluator state: presence, arousal score, and quiet-hours status (closes #18)
+- **`/gaia presence <status>`** — sets user presence (`Available`, `DoNotDisturb`, `Away`, etc.) for the session, controlling notification threshold (closes #18)
+- **`/context` auto-inject skills** — `/context` output now includes auto-inject skill names when `Legion::LLM::Skills::Registry` is available (closes #16)
+- **Debug mode skill count** — status bar debug segment shows `skills:N` when `Legion::LLM::Skills::Registry` is available (closes #16)
+
+### Changed
+- `handle_tools` refactored into `handle_tools_registry` + `handle_tools_gem_scan` helpers for clarity
+
 ## [0.4.42] - 2026-04-08
 
 ### Changed

data/lib/legion/tty/app.rb

@@ -2,8 +2,10 @@
 
 require 'json'
 require 'fileutils'
+require 'legion/logging'
 require_relative 'screen_manager'
 require_relative 'hotkeys'
+require_relative 'notification_gate'
 require_relative 'screens/onboarding'
 require_relative 'screens/chat'
 
@@ -11,6 +13,12 @@ module Legion
   module TTY
     # rubocop:disable Metrics/ClassLength
     class App
+      include Legion::Logging::Helper
+
+      class << self
+        include Legion::Logging::Helper
+      end
+
       CONFIG_DIR = File.expand_path('~/.legionio/settings')
 
       # Key normalization: raw escape sequences and control chars to symbols
@@ -22,11 +30,18 @@ module Legion
         "\e[1~" => :home, "\e[4~" => :end,
         "\x7f" => :backspace, "\b" => :backspace, "\t" => :tab,
         "\x03" => :ctrl_c, "\x04" => :ctrl_d,
-        "\x01" => :ctrl_a, "\x05" => :ctrl_e,
+        "\x01" => :ctrl_a, "\x02" => :ctrl_b,
+        "\x05" => :ctrl_e, "\x06" => :ctrl_f,
         "\x0B" => :ctrl_k, "\x0C" => :ctrl_l, "\x13" => :ctrl_s,
         "\x15" => :ctrl_u
       }.freeze
 
+      ENABLE_ALT_SCREEN = "\e[?1049h"
+      DISABLE_ALT_SCREEN = "\e[?1049l"
+      ENABLE_MOUSE = "\e[?1000h\e[?1006h"
+      DISABLE_MOUSE = "\e[?1000h\e[?1006l"
+      SGR_MOUSE_RE = /\A\e\[<(\d+);(\d+);(\d+)([Mm])\z/
+
       attr_reader :config, :credentials, :screen_manager, :hotkeys, :llm_chat, :input_bar
 
       def self.run(argv = [])
@@ -34,7 +49,7 @@ module Legion
         app = new(**opts)
         app.start
       rescue Interrupt => e
-        Legion::Logging.debug("app interrupted: #{e.message}") if defined?(Legion::Logging)
+        log.debug { "app interrupted: #{e.message}" }
         app&.shutdown
       end
 
@@ -70,7 +85,7 @@ module Legion
       end
 
       # Public: called by screens (e.g., Chat during LLM streaming) to force a re-render
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       def render_frame
         width = terminal_width
         height = terminal_height
@@ -97,9 +112,9 @@ module Legion
 
         $stdout.flush
       rescue StandardError => e
-        Legion::Logging.warn("render_frame failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "render_frame failed: #{e.message}" }
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
       # Temporarily exit raw mode for blocking prompts (TTY::Prompt, etc.)
       def with_cooked_mode(&)
@@ -149,6 +164,8 @@ module Legion
 
         @running = true
         @raw_mode = true
+        $stdout.print ENABLE_ALT_SCREEN
+        $stdout.print ENABLE_MOUSE
         $stdout.print cursor.hide
         $stdout.print cursor.clear_screen
 
@@ -167,9 +184,9 @@ module Legion
         nil
       ensure
         @raw_mode = false
+        $stdout.print DISABLE_MOUSE
         $stdout.print cursor.show
-        $stdout.print cursor.move_to(0, terminal_height - 1)
-        $stdout.puts
+        $stdout.print DISABLE_ALT_SCREEN
         shutdown
       end
       # rubocop:enable Metrics/AbcSize
@@ -180,6 +197,9 @@ module Legion
       end
 
       def normalize_key(raw)
+        mouse = parse_sgr_mouse(raw)
+        return mouse if mouse
+
         KEY_MAP[raw] || raw
       end
 
@@ -205,6 +225,11 @@ module Legion
         active = @screen_manager.active_screen
         return unless active
 
+        if %i[scroll_up scroll_down].include?(key)
+          dispatch_to_screen(active, key)
+          return
+        end
+
         if active.respond_to?(:needs_input_bar?) && active.needs_input_bar? && @input_bar
           dispatch_to_input_screen(active, key)
         else
@@ -289,6 +314,17 @@ module Legion
         seq
       end
 
+      def parse_sgr_mouse(raw)
+        match = SGR_MOUSE_RE.match(raw)
+        return nil unless match
+
+        button = match[1].to_i
+        return :scroll_up if button == 64
+        return :scroll_down if button == 65
+
+        nil
+      end
+
       # --- Rendering ---
 
       # rubocop:disable Metrics/AbcSize
@@ -316,7 +352,7 @@ module Legion
         end
         result
       rescue StandardError => e
-        Legion::Logging.warn("composite_overlay failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "composite_overlay failed: #{e.message}" }
         lines
       end
       # rubocop:enable Metrics/AbcSize
@@ -393,7 +429,7 @@ module Legion
         boot_legion_subsystems
         @llm_chat = try_settings_llm
       rescue StandardError => e
-        Legion::Logging.warn("setup_llm failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "setup_llm failed: #{e.message}" }
         @llm_chat = nil
       end
 
@@ -416,13 +452,13 @@ module Legion
           File.write(identity_path, ::JSON.generate(identity))
           @config = load_config
         rescue StandardError => e
-          Legion::Logging.warn("rescan_environment failed: #{e.message}") if defined?(Legion::Logging)
+          log.warn { "rescan_environment failed: #{e.message}" }
           nil
         end
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def boot_legion_subsystems
         require 'legion/logging'
         Legion::Logging.setup(log_level: 'error', level: 'error', trace: false)
@@ -438,10 +474,10 @@ module Legion
           Legion::Crypt.start unless Legion::Crypt.instance_variable_get(:@started)
           Legion::Settings.resolve_secrets! if Legion::Settings.respond_to?(:resolve_secrets!)
         rescue LoadError => e
-          Legion::Logging.debug("legion/crypt not available: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "legion/crypt not available: #{e.message}" }
           nil
         rescue StandardError => e
-          Legion::Logging.warn("crypt/secrets setup failed: #{e.message}") if defined?(Legion::Logging)
+          log.warn { "crypt/secrets setup failed: #{e.message}" }
           nil
         end
 
@@ -449,14 +485,14 @@ module Legion
           require 'legion/llm'
           Legion::Settings.merge_settings(:llm, Legion::LLM::Settings.default)
         rescue LoadError => e
-          Legion::Logging.debug("legion/llm not available: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "legion/llm not available: #{e.message}" }
           nil
         end
       rescue LoadError => e
-        Legion::Logging.debug("legion subsystem load failed: #{e.message}") if defined?(Legion::Logging)
+        log.debug { "legion subsystem load failed: #{e.message}" }
         nil
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def settings_search_path
         [
@@ -471,15 +507,13 @@ module Legion
         # All LLM calls route through the LegionIO daemon API.
         # No raw RubyLLM session is created here — nil signals "use daemon path".
         if Legion::TTY::DaemonClient.available?
-          Legion::Logging.debug('TTY: daemon available, LLM routed through daemon') if defined?(Legion::Logging)
-        elsif defined?(Legion::Logging)
-          if defined?(Legion::Logging)
-            Legion::Logging.warn('TTY: daemon not running; LLM unavailable until daemon starts')
-          end
+          log.debug { 'TTY: daemon available, LLM routed through daemon' }
+        else
+          log.warn { 'TTY: daemon not running; LLM unavailable until daemon starts' }
         end
         nil
       rescue StandardError => e
-        Legion::Logging.warn("try_settings_llm failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "try_settings_llm failed: #{e.message}" }
         nil
       end
 
@@ -549,7 +583,7 @@ module Legion
 
         deep_symbolize(::JSON.parse(File.read(path)))
       rescue ::JSON::ParserError, Errno::ENOENT => e
-        Legion::Logging.warn("load_credentials failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "load_credentials failed: #{e.message}" }
         {}
       end
 
@@ -566,7 +600,7 @@ module Legion
 
         deep_symbolize(::JSON.parse(File.read(path)))
       rescue ::JSON::ParserError, Errno::ENOENT => e
-        Legion::Logging.warn("load_config failed: #{e.message}") if defined?(Legion::Logging)
+        log.warn { "load_config failed: #{e.message}" }
         {}
       end
 

data/lib/legion/tty/background/github_probe.rb

@@ -3,17 +3,20 @@
 require 'net/http'
 require 'json'
 require 'uri'
+require 'legion/logging'
 
 module Legion
   module TTY
     module Background
       # rubocop:disable Metrics/ClassLength
       class GitHubProbe
+        include Legion::Logging::Helper
+
         API_BASE = 'https://api.github.com'
         USER_AGENT = 'legion-tty/github-probe'
 
         def initialize(token: nil, logger: nil)
-          @log = logger
+          @boot_log = logger
           @token = token || resolve_token
         end
 
@@ -21,19 +24,19 @@ module Legion
         def run_quick_async(queue)
           Thread.new do
             unless @token
-              @log&.log('github', 'quick probe skipped (no token)')
+              @boot_log&.log('github', 'quick probe skipped (no token)')
               queue.push({ type: :github_quick_complete, data: nil })
               return
             end
 
-            @log&.log('github', 'quick probe: fetching /user + recent commits')
+            @boot_log&.log('github', 'quick probe: fetching /user + recent commits')
             t0 = Time.now
             result = fetch_quick_profile
             elapsed = ((Time.now - t0) * 1000).round
-            @log&.log('github', "quick probe complete in #{elapsed}ms")
+            @boot_log&.log('github', "quick probe complete in #{elapsed}ms")
             queue.push({ type: :github_quick_complete, data: result })
           rescue StandardError => e
-            @log&.log('github', "quick probe ERROR: #{e.class}: #{e.message}")
+            @boot_log&.log('github', "quick probe ERROR: #{e.class}: #{e.message}")
             queue.push({ type: :github_quick_error, error: e.message })
           end
         end
@@ -42,9 +45,9 @@ module Legion
         # rubocop:disable Metrics/AbcSize
         def run_async(queue, remotes: [], quick_profile: nil)
           Thread.new do
-            @log&.log('github', "probing with #{remotes.size} remotes: #{remotes.first(5).inspect}")
-            @log&.log('github', "token: #{@token ? 'present' : 'NONE'}")
-            @log&.log('github', "quick_profile: #{quick_profile ? 'reusing' : 'none'}")
+            @boot_log&.log('github', "probing with #{remotes.size} remotes: #{remotes.first(5).inspect}")
+            @boot_log&.log('github', "token: #{@token ? 'present' : 'NONE'}")
+            @boot_log&.log('github', "quick_profile: #{quick_profile ? 'reusing' : 'none'}")
             t0 = Time.now
             result = if @token
                        build_authenticated_result(remotes, quick_profile: quick_profile)
@@ -52,10 +55,10 @@ module Legion
                        build_public_result(remotes)
                      end
             elapsed = ((Time.now - t0) * 1000).round
-            @log&.log('github', "probe complete in #{elapsed}ms")
+            @boot_log&.log('github', "probe complete in #{elapsed}ms")
             queue.push({ type: :github_probe_complete, data: result })
           rescue StandardError => e
-            @log&.log('github', "ERROR: #{e.class}: #{e.message}")
+            @boot_log&.log('github', "ERROR: #{e.class}: #{e.message}")
             queue.push({ type: :github_error, error: e.message })
           end
         end
@@ -71,14 +74,14 @@ module Legion
           return nil unless user_data.is_a?(Hash) && user_data['login']
 
           username = user_data['login']
-          @log&.log('github', "quick: authenticated as #{username}")
+          @boot_log&.log('github', "quick: authenticated as #{username}")
 
           week_ago = (Time.now - (7 * 86_400)).strftime('%Y-%m-%d')
           month_ago = (Time.now - (30 * 86_400)).strftime('%Y-%m-%d')
 
           commits_week = count_commits(username, since: week_ago)
           commits_month = count_commits(username, since: month_ago)
-          @log&.log('github', "quick: commits this week=#{commits_week} this month=#{commits_month}")
+          @boot_log&.log('github', "quick: commits this week=#{commits_week} this month=#{commits_month}")
 
           {
             username: username,
@@ -105,7 +108,7 @@ module Legion
 
           data['total_count'] || 0
         rescue StandardError => e
-          Legion::Logging.debug("count_commits failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "count_commits failed: #{e.message}" }
           0
         end
 
@@ -115,16 +118,16 @@ module Legion
         def build_authenticated_result(remotes, quick_profile: nil)
           if quick_profile
             username = quick_profile[:username]
-            @log&.log('github', "reusing quick profile for: #{username}")
+            @boot_log&.log('github', "reusing quick profile for: #{username}")
             profile = quick_profile
           else
             user_data = api_get('/user')
             unless user_data.is_a?(Hash) && user_data['login']
-              @log&.log('github', 'authenticated /user failed, falling back to public')
+              @boot_log&.log('github', 'authenticated /user failed, falling back to public')
               return build_public_result(remotes)
             end
             username = user_data['login']
-            @log&.log('github', "authenticated as: #{username}")
+            @boot_log&.log('github', "authenticated as: #{username}")
             profile = extract_profile(user_data)
           end
           orgs = fetch_orgs
@@ -227,7 +230,7 @@ module Legion
 
         def build_public_result(remotes)
           username = remotes.filter_map { |r| infer_username(r) }.first
-          @log&.log('github', "inferred username: #{username || 'none'}")
+          @boot_log&.log('github', "inferred username: #{username || 'none'}")
           return { username: nil } unless username
 
           profile_data = api_get("/users/#{username}")
@@ -288,17 +291,17 @@ module Legion
                       ENV.fetch('GH_TOKEN', nil) ||
                       ENV.fetch('GITHUB_PERSONAL_ACCESS_TOKEN', nil)
           if env_token
-            @log&.log('github', 'token source: environment variable')
+            @boot_log&.log('github', 'token source: environment variable')
             return env_token
           end
 
           gh_token = token_from_gh_cli
           if gh_token
-            @log&.log('github', 'token source: gh CLI')
+            @boot_log&.log('github', 'token source: gh CLI')
             return gh_token
           end
 
-          @log&.log('github', 'no token found (no env var, no gh CLI)')
+          @boot_log&.log('github', 'no token found (no env var, no gh CLI)')
           nil
         end
 
@@ -306,10 +309,10 @@ module Legion
           gh_path = `which gh 2>/dev/null`.strip
           return nil if gh_path.empty?
 
-          @log&.log('github', "found gh CLI at #{gh_path}")
+          @boot_log&.log('github', "found gh CLI at #{gh_path}")
 
           status = `gh auth status 2>&1`
-          @log&.log('github', "gh auth status: #{status.lines.first&.strip}")
+          @boot_log&.log('github', "gh auth status: #{status.lines.first&.strip}")
           return nil unless $CHILD_STATUS&.success?
 
           token = `gh auth token 2>/dev/null`.strip
@@ -317,7 +320,7 @@ module Legion
 
           token
         rescue StandardError => e
-          @log&.log('github', "gh CLI error: #{e.message}")
+          @boot_log&.log('github', "gh CLI error: #{e.message}")
           nil
         end
         # --- HTTP ---
@@ -328,7 +331,7 @@ module Legion
           response = http.request(build_request(uri))
           ::JSON.parse(response.body)
         rescue StandardError => e
-          Legion::Logging.debug("api_get failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "api_get failed: #{e.message}" }
           nil
         end
 

data/lib/legion/tty/background/llm_probe.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
+require 'legion/logging'
+
 module Legion
   module TTY
     module Background
       class LlmProbe
+        include Legion::Logging::Helper
+
         def initialize(logger: nil, wait_queue: nil)
-          @log = logger
+          @boot_log = logger
           @wait_queue = wait_queue
         end
 
@@ -15,7 +19,7 @@ module Legion
             result = probe_providers
             queue.push({ data: result })
           rescue StandardError => e
-            @log&.log('llm_probe', "error: #{e.message}")
+            @boot_log&.log('llm_probe', "error: #{e.message}")
             queue.push({ data: { providers: [], error: e.message } })
           end
         end
@@ -36,12 +40,12 @@ module Legion
             sleep 0.2
           end
           if timed_out
-            @log&.log('llm_probe', 'bootstrap wait timed out')
+            @boot_log&.log('llm_probe', 'bootstrap wait timed out')
           else
-            @log&.log('llm_probe', 'bootstrap wait complete')
+            @boot_log&.log('llm_probe', 'bootstrap wait complete')
           end
         rescue StandardError => e
-          @log&.log('llm_probe', "bootstrap wait error: #{e.message}")
+          @boot_log&.log('llm_probe', "bootstrap wait error: #{e.message}")
         end
 
         def probe_providers
@@ -55,7 +59,7 @@ module Legion
         def start_llm
           Legion::LLM.start unless Legion::LLM.started?
         rescue StandardError => e
-          @log&.log('llm_probe', "LLM start failed: #{e.message}")
+          @boot_log&.log('llm_probe', "LLM start failed: #{e.message}")
         end
 
         def collect_provider_results
@@ -64,7 +68,7 @@ module Legion
             next unless config[:enabled]
 
             result = ping_provider(name, config)
-            @log&.log('llm_probe', "#{name}: #{result[:status]} (#{result[:latency_ms]}ms)")
+            @boot_log&.log('llm_probe', "#{name}: #{result[:status]} (#{result[:latency_ms]}ms)")
             result
           end
         end
@@ -77,7 +81,7 @@ module Legion
           { name: name, model: model, status: :ok, latency_ms: latency }
         rescue StandardError => e
           latency = ((Time.now - start_time) * 1000).round
-          Legion::Logging.debug("ping_provider #{name} failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "ping_provider #{name} failed: #{e.message}" }
           { name: name, model: model, status: :configured, latency_ms: latency, error: e.message }
         end
       end

data/lib/legion/tty/background/scanner.rb

@@ -2,12 +2,15 @@
 
 require 'socket'
 require 'fileutils'
+require 'legion/logging'
 
 module Legion
   module TTY
     module Background
       # rubocop:disable Metrics/ClassLength
       class Scanner
+        include Legion::Logging::Helper
+
         MAX_DEPTH = 3
 
         SERVICES = {
@@ -34,7 +37,7 @@ module Legion
 
         def initialize(base_dirs: nil, logger: nil)
           @base_dirs = base_dirs || [File.expand_path('~')]
-          @log = logger
+          @boot_log = logger
         end
 
         def scan_services
@@ -73,14 +76,14 @@ module Legion
 
         def run_async(queue)
           Thread.new do
-            @log&.log('scanner', "starting scan of #{@base_dirs.join(', ')}")
+            @boot_log&.log('scanner', "starting scan of #{@base_dirs.join(', ')}")
             t0 = Time.now
             data = scan_all
             elapsed = ((Time.now - t0) * 1000).round
-            @log&.log('scanner', "scan complete in #{elapsed}ms")
+            @boot_log&.log('scanner', "scan complete in #{elapsed}ms")
             queue.push({ type: :scan_complete, data: data })
           rescue StandardError => e
-            @log&.log('scanner', "ERROR: #{e.class}: #{e.message}")
+            @boot_log&.log('scanner', "ERROR: #{e.class}: #{e.message}")
             queue.push({ type: :scan_error, error: e.message })
           end
         end
@@ -90,11 +93,11 @@ module Legion
         def port_open?(host, port)
           ::Socket.tcp(host, port, connect_timeout: 1) { true }
         rescue StandardError => e
-          Legion::Logging.debug("port_open? #{host}:#{port} failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "port_open? #{host}:#{port} failed: #{e.message}" }
           false
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/AbcSize
         def collect_repos(base, depth = 0)
           return [] unless File.directory?(base)
           return [build_repo_entry(base)] if File.directory?(File.join(base, '.git'))
@@ -106,14 +109,14 @@ module Legion
             child_path = File.join(base, child)
             acc.concat(collect_repos(child_path, depth + 1)) if File.directory?(child_path)
           rescue StandardError => e
-            Legion::Logging.debug("collect_repos child failed: #{e.message}") if defined?(Legion::Logging)
+            log.debug { "collect_repos child failed: #{e.message}" }
             next
           end
         rescue StandardError => e
-          Legion::Logging.debug("collect_repos failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "collect_repos failed: #{e.message}" }
           []
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/AbcSize
 
         def build_repo_entry(path)
           { path: path, name: File.basename(path), remote: git_remote(path),
@@ -124,7 +127,7 @@ module Legion
           out = `git -C #{path.shellescape} remote get-url origin 2>/dev/null`.strip
           out.empty? ? nil : out
         rescue StandardError => e
-          Legion::Logging.debug("git_remote failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "git_remote failed: #{e.message}" }
           nil
         end
 
@@ -132,7 +135,7 @@ module Legion
           out = `git -C #{path.shellescape} rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
           out.empty? ? nil : out
         rescue StandardError => e
-          Legion::Logging.debug("git_branch failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "git_branch failed: #{e.message}" }
           nil
         end
 
@@ -152,7 +155,7 @@ module Legion
 
             File.readlines(full, encoding: 'utf-8', chomp: true).last(500)
           rescue StandardError => e
-            Legion::Logging.debug("read_history_lines failed for #{path}: #{e.message}") if defined?(Legion::Logging)
+            log.debug { "read_history_lines failed for #{path}: #{e.message}" }
             []
           end
         end
@@ -178,11 +181,11 @@ module Legion
           result[:signing_key] = signing_key unless signing_key.empty?
           result
         rescue StandardError => e
-          Legion::Logging.debug("scan_gitconfig failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "scan_gitconfig failed: #{e.message}" }
           nil
         end
 
-        def scan_jfrog
+        def scan_jfrog # rubocop:disable Metrics/AbcSize
           config_path = File.expand_path('~/.jfrog/jfrog-cli.conf.v6')
           return nil unless File.exist?(config_path)
 
@@ -195,7 +198,7 @@ module Legion
             { server_id: s[:serverId], url: s[:url], user: s[:user] }
           end
         rescue StandardError => e
-          Legion::Logging.debug("scan_jfrog failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "scan_jfrog failed: #{e.message}" }
           nil
         end
 
@@ -210,7 +213,7 @@ module Legion
 
           { hosts: hosts.map(&:to_s) }
         rescue StandardError => e
-          Legion::Logging.debug("scan_terraform failed: #{e.message}") if defined?(Legion::Logging)
+          log.debug { "scan_terraform failed: #{e.message}" }
           nil
         end
       end