beniya 0.6.0 → 0.6.1

data/lib/beniya/keybind_handler.rb

@@ -1,25 +1,51 @@
 # frozen_string_literal: true
 
 require 'shellwords'
-require_relative 'bookmark'
 require_relative 'file_opener'
+require_relative 'filter_manager'
+require_relative 'selection_manager'
+require_relative 'file_operations'
+require_relative 'bookmark_manager'
+require_relative 'zoxide_integration'
+require_relative 'dialog_renderer'
+require_relative 'logger'
 
 module Beniya
   class KeybindHandler
-    attr_reader :current_index, :filter_query
+    attr_reader :current_index
+
+    def filter_query
+      @filter_manager.filter_query
+    end
+
+    # ASCII character range constants
+    ASCII_PRINTABLE_START = 32
+    ASCII_PRINTABLE_END = 127
+    MULTIBYTE_THRESHOLD = 1
+
+    # Dialog size constants
+    CONFIRMATION_DIALOG_WIDTH = 45
+    DIALOG_BORDER_HEIGHT = 4
+
+    # File system operation constants
+    FILESYSTEM_SYNC_DELAY = 0.01  # 10ms wait for filesystem sync
 
     def initialize
       @current_index = 0
       @directory_listing = nil
       @terminal_ui = nil
       @file_opener = FileOpener.new
-      @filter_mode = false
-      @filter_query = ''
-      @filtered_entries = []
-      @original_entries = []
-      @selected_items = []
+
+      # New manager classes
+      @filter_manager = FilterManager.new
+      @selection_manager = SelectionManager.new
+      @file_operations = FileOperations.new
+      @dialog_renderer = DialogRenderer.new
+      @bookmark_manager = BookmarkManager.new(Bookmark.new, @dialog_renderer)
+      @zoxide_integration = ZoxideIntegration.new(@dialog_renderer)
+
+      # Legacy fields for backward compatibility
       @base_directory = nil
-      @bookmark = Bookmark.new
     end
 
     def set_directory_listing(directory_listing)
@@ -36,18 +62,18 @@ module Beniya
     end
 
     def selected_items
-      @selected_items.dup
+      @selection_manager.selected_items
     end
 
     def is_selected?(entry_name)
-      @selected_items.include?(entry_name)
+      @selection_manager.selected?(entry_name)
     end
 
     def handle_key(key)
       return false unless @directory_listing
 
       # フィルターモード中は他のキーバインドを無効化
-      return handle_filter_input(key) if @filter_mode
+      return handle_filter_input(key) if @filter_manager.filter_mode
 
       case key
       when 'j'
@@ -69,10 +95,9 @@ module Beniya
       when 'e'  # e - open directory in file explorer
         open_directory_in_explorer
       when 'f'  # f - filter files
-        if !@filter_query.empty?
+        if @filter_manager.filter_active?
           # フィルタが設定されている場合は再編集モードに入る
-          @filter_mode = true
-          @original_entries = @directory_listing.list_entries.dup if @original_entries.empty?
+          @filter_manager.restart_filter_mode(@directory_listing.list_entries)
         else
           # 新規フィルターモード開始
           start_filter_mode
@@ -80,7 +105,7 @@ module Beniya
       when ' ' # Space - toggle selection
         toggle_selection
       when "\e" # ESC
-        if !@filter_query.empty?
+        if @filter_manager.filter_active?
           # フィルタが設定されている場合はクリア
           clear_filter_mode
           true
@@ -127,12 +152,12 @@ module Beniya
     end
 
     def filter_active?
-      @filter_mode || !@filter_query.empty?
+      @filter_manager.filter_active?
     end
 
     def get_active_entries
-      if @filter_mode || !@filter_query.empty?
-        @filtered_entries.empty? ? [] : @filtered_entries
+      if @filter_manager.filter_active?
+        @filter_manager.filtered_entries
       else
         @directory_listing&.list_entries || []
       end
@@ -193,10 +218,9 @@ module Beniya
       @terminal_ui&.refresh_display
 
       @directory_listing.refresh
-      if @filter_mode || !@filter_query.empty?
+      if @filter_manager.filter_active?
         # Re-apply filter with new directory contents
-        @original_entries = @directory_listing.list_entries.dup
-        apply_filter
+        @filter_manager.update_entries(@directory_listing.list_entries)
       else
         # adjust index to stay within bounds after refresh
         entries = @directory_listing.list_entries
@@ -233,12 +257,16 @@ module Beniya
       current_path = @directory_listing&.current_path || Dir.pwd
 
       # fzfでファイル検索を実行
-      selected_file = `cd "#{current_path}" && find . -type f | fzf --preview 'cat {}'`.strip
+      # Dir.chdirを使用してディレクトリ移動を安全に行う
+      selected_file = nil
+      Dir.chdir(current_path) do
+        selected_file = `find . -type f | fzf --preview 'cat {}'`.strip
+      end
 
       # ファイルが選択された場合、そのファイルを開く
-      if !selected_file.empty? && File.exist?(File.join(current_path, selected_file))
+      if !selected_file.empty?
         full_path = File.expand_path(selected_file, current_path)
-        @file_opener.open_file(full_path)
+        @file_opener.open_file(full_path) if File.exist?(full_path)
       end
 
       true
@@ -259,7 +287,13 @@ module Beniya
       return false if search_query.empty?
 
       # execute rga file content search
-      search_results = `cd "#{current_path}" && rga --line-number --with-filename "#{search_query}" . 2>/dev/null`
+      # Dir.chdirを使用してディレクトリ移動を安全に行う
+      search_results = nil
+      Dir.chdir(current_path) do
+        # Shellwords.escapeで検索クエリをエスケープ
+        escaped_query = Shellwords.escape(search_query)
+        search_results = `rga --line-number --with-filename #{escaped_query} . 2>/dev/null`
+      end
 
       if search_results.empty?
         puts "\n#{ConfigLoader.message('keybind.no_matches')}"
@@ -292,65 +326,36 @@ module Beniya
     end
 
     def start_filter_mode
-      @filter_mode = true
-      @filter_query = ''
-      @original_entries = @directory_listing.list_entries.dup
-      @filtered_entries = @original_entries.dup
+      @filter_manager.start_filter_mode(@directory_listing.list_entries)
       @current_index = 0
       true
     end
 
     def handle_filter_input(key)
-      case key
-      when "\e" # ESC - フィルタをクリアして通常モードに戻る
+      result = @filter_manager.handle_filter_input(key)
+
+      case result
+      when :exit_clear
         clear_filter_mode
-      when "\r", "\n" # Enter - フィルタを維持して通常モードに戻る
+      when :exit_keep
         exit_filter_mode_keep_filter
-      when "\u007f", "\b" # Backspace
-        if @filter_query.length > 0
-          @filter_query = @filter_query[0...-1]
-          apply_filter
-        else
-          clear_filter_mode
-        end
-      else
-        # printable characters (英数字、記号、日本語文字など)
-        if key.length == 1 && key.ord >= 32 && key.ord < 127 # ASCII printable
-          @filter_query += key
-          apply_filter
-        elsif key.bytesize > 1 # Multi-byte characters (Japanese, etc.)
-          @filter_query += key
-          apply_filter
-        end
-        # その他のキー（Ctrl+c等）は無視
+      when :backspace_exit
+        clear_filter_mode
+      when :continue
+        @current_index = [@current_index, [@filter_manager.filtered_entries.length - 1, 0].max].min
       end
-      true
-    end
 
-    def apply_filter
-      if @filter_query.empty?
-        @filtered_entries = @original_entries.dup
-      else
-        query_downcase = @filter_query.downcase
-        @filtered_entries = @original_entries.select do |entry|
-          entry[:name].downcase.include?(query_downcase)
-        end
-      end
-      @current_index = [@current_index, [@filtered_entries.length - 1, 0].max].min
+      true
     end
 
     def exit_filter_mode_keep_filter
       # フィルタを維持したまま通常モードに戻る
-      @filter_mode = false
-      # @filter_query, @filtered_entries は維持
+      @filter_manager.exit_filter_mode_keep_filter
     end
 
     def clear_filter_mode
       # フィルタをクリアして通常モードに戻る
-      @filter_mode = false
-      @filter_query = ''
-      @filtered_entries = []
-      @original_entries = []
+      @filter_manager.clear_filter
       @current_index = 0
     end
 
@@ -367,46 +372,24 @@ module Beniya
       filename = STDIN.gets.chomp
       return false if filename.empty?
 
-      # 不正なファイル名のチェック
-      if filename.include?('/') || filename.include?('\\')
-        puts "\n#{ConfigLoader.message('keybind.invalid_filename')}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        return false
-      end
-
-      file_path = File.join(current_path, filename)
-
-      # ファイルが既に存在する場合の確認
-      if File.exist?(file_path)
-        puts "\n#{ConfigLoader.message('keybind.file_exists')}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        return false
-      end
-
-      begin
-        # ファイルを作成
-        File.write(file_path, '')
+      # FileOperationsを使用してファイルを作成
+      result = @file_operations.create_file(current_path, filename)
 
-        # ディレクトリ表示を更新
+      # ディレクトリ表示を更新
+      if result.success
         @directory_listing.refresh
 
         # 作成したファイルを選択状態にする
         entries = @directory_listing.list_entries
         new_file_index = entries.find_index { |entry| entry[:name] == filename }
         @current_index = new_file_index if new_file_index
-
-        puts "\n#{ConfigLoader.message('keybind.file_created')}: #{filename}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        true
-      rescue StandardError => e
-        puts "\n#{ConfigLoader.message('keybind.creation_error')}: #{e.message}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        false
       end
+
+      # 結果を表示
+      puts "\n#{result.message}"
+      print ConfigLoader.message('keybind.press_any_key')
+      STDIN.getch
+      result.success
     end
 
     def create_directory
@@ -417,75 +400,63 @@ module Beniya
       dirname = STDIN.gets.chomp
       return false if dirname.empty?
 
-      # 不正なディレクトリ名のチェック
-      if dirname.include?('/') || dirname.include?('\\')
-        puts "\n#{ConfigLoader.message('keybind.invalid_dirname')}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        return false
-      end
-
-      dir_path = File.join(current_path, dirname)
+      # FileOperationsを使用してディレクトリを作成
+      result = @file_operations.create_directory(current_path, dirname)
 
-      # ディレクトリが既に存在する場合の確認
-      if File.exist?(dir_path)
-        puts "\n#{ConfigLoader.message('keybind.directory_exists')}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        return false
-      end
-
-      begin
-        # ディレクトリを作成
-        Dir.mkdir(dir_path)
-
-        # ディレクトリ表示を更新
+      # ディレクトリ表示を更新
+      if result.success
         @directory_listing.refresh
 
         # 作成したディレクトリを選択状態にする
         entries = @directory_listing.list_entries
         new_dir_index = entries.find_index { |entry| entry[:name] == dirname }
         @current_index = new_dir_index if new_dir_index
-
-        puts "\n#{ConfigLoader.message('keybind.directory_created')}: #{dirname}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        true
-      rescue StandardError => e
-        puts "\n#{ConfigLoader.message('keybind.creation_error')}: #{e.message}"
-        print ConfigLoader.message('keybind.press_any_key')
-        STDIN.getch
-        false
       end
+
+      # 結果を表示
+      puts "\n#{result.message}"
+      print ConfigLoader.message('keybind.press_any_key')
+      STDIN.getch
+      result.success
     end
 
     def toggle_selection
       entry = current_entry
       return false unless entry
 
-      if @selected_items.include?(entry[:name])
-        @selected_items.delete(entry[:name])
-      else
-        @selected_items << entry[:name]
-      end
+      @selection_manager.toggle_selection(entry)
       true
     end
 
     def move_selected_to_base
-      return false if @selected_items.empty? || @base_directory.nil?
+      return false if @selection_manager.empty? || @base_directory.nil?
+
+      if show_confirmation_dialog('Move', @selection_manager.count)
+        current_path = @directory_listing&.current_path || Dir.pwd
+        result = @file_operations.move(@selection_manager.selected_items, current_path, @base_directory)
 
-      if show_confirmation_dialog('Move', @selected_items.length)
-        perform_file_operation(:move, @selected_items, @base_directory)
+        # Show result and refresh
+        show_operation_result(result)
+        @selection_manager.clear
+        @directory_listing.refresh if @directory_listing
+        true
       else
         false
       end
     end
 
     def copy_selected_to_base
-      return false if @selected_items.empty? || @base_directory.nil?
+      return false if @selection_manager.empty? || @base_directory.nil?
+
+      if show_confirmation_dialog('Copy', @selection_manager.count)
+        current_path = @directory_listing&.current_path || Dir.pwd
+        result = @file_operations.copy(@selection_manager.selected_items, current_path, @base_directory)
 
-      if show_confirmation_dialog('Copy', @selected_items.length)
-        perform_file_operation(:copy, @selected_items, @base_directory)
+        # Show result and refresh
+        show_operation_result(result)
+        @selection_manager.clear
+        @directory_listing.refresh if @directory_listing
+        true
       else
         false
       end
@@ -497,54 +468,30 @@ module Beniya
       %w[y yes].include?(response)
     end
 
-    def perform_file_operation(operation, items, destination)
-      success_count = 0
-      current_path = @directory_listing&.current_path || Dir.pwd
-
-      items.each do |item_name|
-        source_path = File.join(current_path, item_name)
-        dest_path = File.join(destination, item_name)
-
-        begin
-          case operation
-          when :move
-            if File.exist?(dest_path)
-              puts "\n#{item_name} already exists in destination. Skipping."
-              next
-            end
-            FileUtils.mv(source_path, dest_path)
-          when :copy
-            if File.exist?(dest_path)
-              puts "\n#{item_name} already exists in destination. Skipping."
-              next
-            end
-            if File.directory?(source_path)
-              FileUtils.cp_r(source_path, dest_path)
-            else
-              FileUtils.cp(source_path, dest_path)
-            end
-          end
-          success_count += 1
-        rescue StandardError => e
-          puts "\nFailed to #{operation == :move ? 'move' : 'copy'} #{item_name}: #{e.message}"
-        end
+    # Helper method to show operation result
+    def show_operation_result(result)
+      if result.errors.any?
+        puts "\n#{result.message}"
+        result.errors.each { |error| puts "  - #{error}" }
+      else
+        puts "\n#{result.message}"
       end
-
-      # 操作完了後の処理
-      @selected_items.clear
-      @directory_listing.refresh if @directory_listing
-
-      puts "\n#{operation == :move ? 'Moved' : 'Copied'} #{success_count} item(s)."
       print 'Press any key to continue...'
       STDIN.getch
-      true
     end
 
     def delete_selected_files
-      return false if @selected_items.empty?
+      return false if @selection_manager.empty?
+
+      if show_delete_confirmation(@selection_manager.count)
+        current_path = @directory_listing&.current_path || Dir.pwd
+        result = @file_operations.delete(@selection_manager.selected_items, current_path)
 
-      if show_delete_confirmation(@selected_items.length)
-        perform_delete_operation(@selected_items)
+        # Show detailed delete result
+        show_deletion_result(result.count, @selection_manager.count, result.errors)
+        @selection_manager.clear
+        @directory_listing.refresh if @directory_listing
+        true
       else
         false
       end
@@ -567,15 +514,15 @@ module Beniya
       ]
 
       # ダイアログのサイズ設定（コンテンツに合わせて調整）
-      dialog_width = 45
-      # タイトルあり: 上枠1 + タイトル1 + 区切り1 + コンテンツ6 + 下枠1 = 10
-      dialog_height = 4 + content_lines.length
+      dialog_width = CONFIRMATION_DIALOG_WIDTH
+      # タイトルあり: 上枠1 + タイトル1 + 区切り1 + コンテンツ + 下枠1
+      dialog_height = DIALOG_BORDER_HEIGHT + content_lines.length
 
       # ダイアログの位置を中央に設定
-      x, y = get_screen_center(dialog_width, dialog_height)
+      x, y = @dialog_renderer.calculate_center(dialog_width, dialog_height)
 
       # ダイアログの描画
-      draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
+      @dialog_renderer.draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
                              border_color: "\e[31m", # 赤色（警告）
                              title_color: "\e[1;31m",   # 太字赤色
                              content_color: "\e[37m"    # 白色
@@ -591,16 +538,16 @@ module Beniya
         case input
         when 'y'
           # ダイアログをクリア
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
+          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
           @terminal_ui&.refresh_display # 画面を再描画
           return true
         when 'n', "\e", "\x03" # n, ESC, Ctrl+C
           # ダイアログをクリア
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
+          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
           @terminal_ui&.refresh_display # 画面を再描画
           return false
         when 'q' # qキーでもキャンセル
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
+          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
           @terminal_ui&.refresh_display
           return false
         end
@@ -609,100 +556,73 @@ module Beniya
     end
 
     def perform_delete_operation(items)
+      Logger.debug('Starting delete operation', context: { items: items, count: items.length })
+
       success_count = 0
       error_messages = []
       current_path = @directory_listing&.current_path || Dir.pwd
-      debug_log = []
 
       items.each do |item_name|
         item_path = File.join(current_path, item_name)
-        debug_log << "Processing: #{item_name}"
+        Logger.debug("Processing deletion", context: { item: item_name, path: item_path })
 
         begin
           # ファイル/ディレクトリの存在確認
           unless File.exist?(item_path)
             error_messages << "#{item_name}: File not found"
-            debug_log << '  Error: File not found'
+            Logger.warn("File not found for deletion", context: { item: item_name })
             next
           end
 
-          debug_log << '  Existence check: OK'
           is_directory = File.directory?(item_path)
-          debug_log << "  Type: #{is_directory ? 'Directory' : 'File'}"
+          Logger.debug("Item type determined", context: { item: item_name, type: is_directory ? 'Directory' : 'File' })
 
           if is_directory
             FileUtils.rm_rf(item_path)
-            debug_log << '  FileUtils.rm_rf executed'
           else
             FileUtils.rm(item_path)
-            debug_log << '  FileUtils.rm executed'
           end
 
           # 削除が実際に成功したかを確認
-          sleep(0.01) # 10ms待機してファイルシステムの同期を待つ
+          sleep(FILESYSTEM_SYNC_DELAY) # wait for filesystem sync
           still_exists = File.exist?(item_path)
-          debug_log << "  Post-deletion check: #{still_exists}"
 
           if still_exists
             error_messages << "#{item_name}: Deletion failed"
-            debug_log << '  Result: Failed'
+            Logger.error("Deletion failed", context: { item: item_name, still_exists: true })
           else
             success_count += 1
-            debug_log << '  Result: Success'
+            Logger.debug("Deletion successful", context: { item: item_name })
           end
         rescue StandardError => e
           error_messages << "#{item_name}: #{e.message}"
-          debug_log << "  Exception: #{e.message}"
+          Logger.error("Exception during deletion", exception: e, context: { item: item_name })
         end
       end
 
-      # デバッグログをファイルに出力（開発時のみ）
-      if ENV['BENIYA_DEBUG'] == '1'
-        debug_file = File.join(Dir.home, '.beniya_delete_debug.log')
-        File.open(debug_file, 'a') do |f|
-          f.puts "=== Delete Process Debug #{Time.now} ==="
-          f.puts "Target directory: #{current_path}"
-          f.puts "Target items: #{items.inspect}"
-          debug_log.each { |line| f.puts line }
-          f.puts "Final result: #{success_count} successful, #{items.length - success_count} failed"
-          f.puts "Error messages: #{error_messages.inspect}"
-          f.puts ''
-        end
-      end
-
-
-      # デバッグ用：削除結果の値をログファイルに出力
-      result_debug_file = File.join(Dir.home, '.beniya_result_debug.log')
-      File.open(result_debug_file, 'a') do |f|
-        f.puts "=== Delete Result Debug #{Time.now} ==="
-        f.puts "success_count: #{success_count}"
-        f.puts "total_count: #{items.length}"
-        f.puts "error_messages.length: #{error_messages.length}"
-        f.puts "has_errors: #{!error_messages.empty?}"
-        f.puts "condition check: success_count == total_count && !has_errors = #{success_count == items.length && error_messages.empty?}"
-        f.puts ""
-      end
+      Logger.debug('Delete operation completed', context: {
+        success_count: success_count,
+        total_count: items.length,
+        error_count: error_messages.length,
+        has_errors: !error_messages.empty?
+      })
 
       # 削除結果をフローティングウィンドウで表示
       show_deletion_result(success_count, items.length, error_messages)
 
       # 削除完了後の処理
-      @selected_items.clear
+      @selection_manager.clear
       @directory_listing.refresh if @directory_listing
 
       true
     end
 
     def show_deletion_result(success_count, total_count, error_messages = [])
-      # 詳細デバッグログを出力
-      detailed_debug_file = File.join(Dir.home, '.beniya_detailed_debug.log')
-      File.open(detailed_debug_file, 'a') do |f|
-        f.puts "=== show_deletion_result called #{Time.now} ==="
-        f.puts "Arguments: success_count=#{success_count}, total_count=#{total_count}"
-        f.puts "error_messages: #{error_messages.inspect}"
-        f.puts "error_messages.empty?: #{error_messages.empty?}"
-        f.puts ""
-      end
+      Logger.debug('Showing deletion result dialog', context: {
+        success_count: success_count,
+        total_count: total_count,
+        error_messages: error_messages
+      })
 
       # エラーメッセージがある場合はダイアログサイズを拡大
       has_errors = !error_messages.empty?
@@ -710,10 +630,9 @@ module Beniya
       dialog_height = has_errors ? [8 + error_messages.length, 15].min : 6
 
       # ダイアログの位置を中央に設定
-      x, y = get_screen_center(dialog_width, dialog_height)
+      x, y = @dialog_renderer.calculate_center(dialog_width, dialog_height)
 
       # 成功・失敗に応じた色設定
-      # デバッグ: success_count == total_count かつ has_errors が false の場合のみ成功扱い
       if success_count == total_count && !has_errors
         border_color = "\e[32m"   # 緑色（成功）
         title_color = "\e[1;32m"  # 太字緑色
@@ -735,10 +654,6 @@ module Beniya
       # コンテンツの準備
       content_lines = ['', message]
 
-      # デバッグ情報を追加（開発中のみ）
-      content_lines << ""
-      content_lines << "DEBUG: success=#{success_count}, total=#{total_count}, errors=#{error_messages.length}"
-
       # エラーメッセージがある場合は追加
       if has_errors
         content_lines << ''
@@ -750,7 +665,7 @@ module Beniya
       content_lines << 'Press any key to continue...'
 
       # ダイアログの描画
-      draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
+      @dialog_renderer.draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
                              border_color: border_color,
                              title_color: title_color,
                              content_color: "\e[37m"
@@ -760,469 +675,94 @@ module Beniya
       STDIN.getch
 
       # ダイアログをクリア
-      clear_floating_window_area(x, y, dialog_width, dialog_height)
+      @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
       @terminal_ui&.refresh_display
     end
 
-    # フローティングウィンドウの基盤メソッド
-    def draw_floating_window(x, y, width, height, title, content_lines, options = {})
-      # デフォルトオプション
-      border_color = options[:border_color] || "\e[37m"  # 白色
-      title_color = options[:title_color] || "\e[1;33m"  # 黄色（太字）
-      content_color = options[:content_color] || "\e[37m" # 白色
-      reset_color = "\e[0m"
-
-      # ウィンドウの描画
-      # 上辺
-      print "\e[#{y};#{x}H#{border_color}┌#{'─' * (width - 2)}┐#{reset_color}"
-
-      # タイトル行
-      if title
-        title_width = display_width(title)
-        title_padding = (width - 2 - title_width) / 2
-        padded_title = ' ' * title_padding + title
-        title_line = pad_string_to_width(padded_title, width - 2)
-        print "\e[#{y + 1};#{x}H#{border_color}│#{title_color}#{title_line}#{border_color}│#{reset_color}"
-
-        # タイトル区切り線
-        print "\e[#{y + 2};#{x}H#{border_color}├#{'─' * (width - 2)}┤#{reset_color}"
-        content_start_y = y + 3
-      else
-        content_start_y = y + 1
-      end
-
-      # コンテンツ行
-      content_height = title ? height - 4 : height - 2
-      content_lines.each_with_index do |line, index|
-        break if index >= content_height
-
-        line_y = content_start_y + index
-        line_content = pad_string_to_width(line, width - 2) # 正確な幅でパディング
-        print "\e[#{line_y};#{x}H#{border_color}│#{content_color}#{line_content}#{border_color}│#{reset_color}"
-      end
-
-      # 空行を埋める
-      remaining_lines = content_height - content_lines.length
-      remaining_lines.times do |i|
-        line_y = content_start_y + content_lines.length + i
-        empty_line = ' ' * (width - 2)
-        print "\e[#{line_y};#{x}H#{border_color}│#{empty_line}│#{reset_color}"
-      end
-
-      # 下辺
-      bottom_y = y + height - 1
-      print "\e[#{bottom_y};#{x}H#{border_color}└#{'─' * (width - 2)}┘#{reset_color}"
-    end
-
-    def display_width(str)
-      # 日本語文字の幅を考慮した文字列幅の計算
-      # Unicode East Asian Width プロパティを考慮
-      str.each_char.map do |char|
-        case char
-        when /[\u3000-\u303F\u3040-\u309F\u30A0-\u30FF\u4E00-\u9FAF\uFF00-\uFFEF]/
-          # 日本語の文字（ひらがな、カタカナ、漢字、全角記号）
-          2
-        when /[\u0020-\u007E]/
-          # ASCII文字
-          1
-        else
-          # その他の文字はバイト数で判断
-          char.bytesize > 1 ? 2 : 1
-        end
-      end.sum
-    end
-
-    def pad_string_to_width(str, target_width)
-      # 文字列を指定した表示幅になるようにパディング
-      current_width = display_width(str)
-      if current_width >= target_width
-        # 文字列が長すぎる場合は切り詰め
-        truncate_to_width(str, target_width)
-      else
-        # 不足分をスペースで埋める
-        str + ' ' * (target_width - current_width)
-      end
-    end
-
-    def truncate_to_width(str, max_width)
-      # 指定した表示幅に収まるように文字列を切り詰め
-      result = ''
-      current_width = 0
-
-      str.each_char do |char|
-        char_width = display_width(char)
-        break if current_width + char_width > max_width
-
-        result += char
-        current_width += char_width
-      end
-
-      result
-    end
-
-    def get_screen_center(content_width, content_height)
-      # ターミナルのサイズを取得
-      console = IO.console
-      if console
-        screen_width, screen_height = console.winsize.reverse
-      else
-        screen_width = 80
-        screen_height = 24
-      end
-
-      # 中央位置を計算
-      x = [(screen_width - content_width) / 2, 1].max
-      y = [(screen_height - content_height) / 2, 1].max
-
-      [x, y]
-    end
-
-    def clear_floating_window_area(x, y, width, height)
-      # フローティングウィンドウの領域をクリア
-      height.times do |row|
-        print "\e[#{y + row};#{x}H#{' ' * width}"
-      end
-    end
 
     # ブックマーク機能
     def show_bookmark_menu
       current_path = @directory_listing&.current_path || Dir.pwd
-      
-      # メニューの準備
-      title = 'Bookmark Menu'
-      content_lines = [
-        '',
-        '[A]dd current directory to bookmarks',
-        '[L]ist bookmarks',
-        '[R]emove bookmark',
-        '',
-        'Press 1-9 to go to bookmark directly',
-        '',
-        'Press any other key to cancel'
-      ]
-
-      dialog_width = 45
-      dialog_height = 4 + content_lines.length
-      x, y = get_screen_center(dialog_width, dialog_height)
-
-      # ダイアログの描画
-      draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
-                             border_color: "\e[34m", # 青色
-                             title_color: "\e[1;34m",   # 太字青色
-                             content_color: "\e[37m"    # 白色
-                           })
+      result = @bookmark_manager.show_menu(current_path)
 
-      # キー入力待機
-      loop do
-        input = STDIN.getch.downcase
-
-        case input
-        when 'a'
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          add_bookmark_interactive(current_path)
-          return true
-        when 'l'
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          list_bookmarks_interactive
-          return true
-        when 'r'
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          remove_bookmark_interactive
-          return true
-        when '1', '2', '3', '4', '5', '6', '7', '8', '9'
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          goto_bookmark(input.to_i)
-          return true
-        else
-          # キャンセル
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          return false
-        end
-      end
-    end
-
-    def add_bookmark_interactive(path)
-      print ConfigLoader.message('bookmark.input_name') || "Enter bookmark name: "
-      name = STDIN.gets.chomp
-      return false if name.empty?
+      @terminal_ui&.refresh_display
 
-      if @bookmark.add(path, name)
-        puts "\n#{ConfigLoader.message('bookmark.added') || 'Bookmark added'}: #{name}"
+      case result[:action]
+      when :add
+        success = @bookmark_manager.add_interactive(result[:path])
+        wait_for_keypress
+        success
+      when :list
+        @bookmark_manager.list_interactive
+        wait_for_keypress
+        true
+      when :remove
+        @bookmark_manager.remove_interactive
+        wait_for_keypress
+        true
+      when :navigate
+        goto_bookmark(result[:number])
       else
-        puts "\n#{ConfigLoader.message('bookmark.add_failed') || 'Failed to add bookmark'}"
+        false
       end
-      
-      print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-      STDIN.getch
-      true
     end
 
-    def remove_bookmark_interactive
-      bookmarks = @bookmark.list
-      
-      if bookmarks.empty?
-        puts "\n#{ConfigLoader.message('bookmark.no_bookmarks') || 'No bookmarks found'}"
-        print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-        STDIN.getch
-        return false
-      end
+    def goto_bookmark(number)
+      bookmark = @bookmark_manager.find_by_number(number)
 
-      puts "\nBookmarks:"
-      bookmarks.each_with_index do |bookmark, index|
-        puts "  #{index + 1}. #{bookmark[:name]} (#{bookmark[:path]})"
-      end
-      
-      print ConfigLoader.message('bookmark.input_number') || "Enter number to remove: "
-      input = STDIN.gets.chomp
-      number = input.to_i
-      
-      if number > 0 && number <= bookmarks.length
-        bookmark_to_remove = bookmarks[number - 1]
-        if @bookmark.remove(bookmark_to_remove[:name])
-          puts "\n#{ConfigLoader.message('bookmark.removed') || 'Bookmark removed'}: #{bookmark_to_remove[:name]}"
-        else
-          puts "\n#{ConfigLoader.message('bookmark.remove_failed') || 'Failed to remove bookmark'}"
-        end
+      return show_error_and_wait('bookmark.not_found', number) unless bookmark
+      return show_error_and_wait('bookmark.path_not_exist', bookmark[:path]) unless @bookmark_manager.path_exists?(bookmark)
+
+      # ディレクトリに移動
+      if navigate_to_directory(bookmark[:path])
+        puts "\n#{ConfigLoader.message('bookmark.navigated') || 'Navigated to bookmark'}: #{bookmark[:name]}"
+        sleep(0.5) # 短時間表示
+        true
       else
-        puts "\n#{ConfigLoader.message('bookmark.invalid_number') || 'Invalid number'}"
+        show_error_and_wait('bookmark.navigate_failed', bookmark[:name])
       end
-      
-      print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-      STDIN.getch
-      true
     end
 
-    def list_bookmarks_interactive
-      bookmarks = @bookmark.list
-      
-      if bookmarks.empty?
-        puts "\n#{ConfigLoader.message('bookmark.no_bookmarks') || 'No bookmarks found'}"
-        print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-        STDIN.getch
-        return false
-      end
-
-      puts "\nBookmarks:"
-      bookmarks.each_with_index do |bookmark, index|
-        puts "  #{index + 1}. #{bookmark[:name]} (#{bookmark[:path]})"
-      end
-      
+    # ヘルパーメソッド
+    def wait_for_keypress
       print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
       STDIN.getch
-      true
     end
 
-    def goto_bookmark(number)
-      bookmark = @bookmark.find_by_number(number)
-      
-      unless bookmark
-        puts "\n#{ConfigLoader.message('bookmark.not_found') || 'Bookmark not found'}: #{number}"
-        print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-        STDIN.getch
-        return false
-      end
-
-      unless Dir.exist?(bookmark[:path])
-        puts "\n#{ConfigLoader.message('bookmark.path_not_exist') || 'Bookmark path does not exist'}: #{bookmark[:path]}"
-        print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-        STDIN.getch
-        return false
-      end
+    def show_error_and_wait(message_key, value)
+      puts "\n#{ConfigLoader.message(message_key) || message_key}: #{value}"
+      wait_for_keypress
+      false
+    end
 
-      # ディレクトリに移動
-      result = @directory_listing.navigate_to_path(bookmark[:path])
+    def navigate_to_directory(path)
+      result = @directory_listing.navigate_to_path(path)
       if result
         @current_index = 0
         clear_filter_mode
-        puts "\n#{ConfigLoader.message('bookmark.navigated') || 'Navigated to bookmark'}: #{bookmark[:name]}"
-        sleep(0.5) # 短時間表示
-        return true
+        true
       else
-        puts "\n#{ConfigLoader.message('bookmark.navigate_failed') || 'Failed to navigate to bookmark'}: #{bookmark[:name]}"
-        print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-        STDIN.getch
-        return false
+        false
       end
     end
 
     # zoxide 機能
     def show_zoxide_menu
-      history = get_zoxide_history
-      
-      if history.empty?
-        show_no_zoxide_history_message
-        return false
-      end
+      selected_path = @zoxide_integration.show_menu
 
-      # zoxide履歴選択UI
-      selected_path = select_from_zoxide_history(history)
-      
-      if selected_path
-        navigate_to_zoxide_directory(selected_path)
+      if selected_path && Dir.exist?(selected_path)
+        if navigate_to_directory(selected_path)
+          @zoxide_integration.add_to_history(selected_path)
+          true
+        else
+          false
+        end
       else
+        @terminal_ui&.refresh_display
         false
       end
     end
 
     private
-
-    def zoxide_available?
-      system('which zoxide > /dev/null 2>&1')
-    end
-
-    def get_zoxide_history
-      return [] unless zoxide_available?
-
-      begin
-        # zoxide query --list --score で履歴を取得（スコア順）
-        output = `zoxide query --list --score 2>/dev/null`.strip
-        return [] if output.empty?
-
-        # 各行をパスとスコアに分けて配列に変換
-        lines = output.split("\n")
-        history = lines.map do |line|
-          # zoxide の出力は "スコア パス" の形式
-          if line.match(/^\s*(\d+(?:\.\d+)?)\s+(.+)$/)
-            score = $1.to_f
-            path = $2.strip
-            { path: path, score: score }
-          else
-            # スコアがない場合はパスのみ（後方互換性）
-            { path: line.strip, score: 0.0 }
-          end
-        end
-
-        # 有効なディレクトリのみフィルタリング
-        history.select { |entry| Dir.exist?(entry[:path]) }
-      rescue StandardError
-        []
-      end
-    end
-
-    def show_no_zoxide_history_message
-      title = 'Zoxide'
-      content_lines = [
-        '',
-        'No zoxide history found.',
-        '',
-        'Zoxide learns from your directory navigation.',
-        'Use zoxide more to build up history.',
-        '',
-        'Press any key to continue...'
-      ]
-
-      dialog_width = 45
-      dialog_height = 4 + content_lines.length
-      x, y = get_screen_center(dialog_width, dialog_height)
-
-      draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
-                             border_color: "\e[33m", # 黄色
-                             title_color: "\e[1;33m",   # 太字黄色
-                             content_color: "\e[37m"    # 白色
-                           })
-
-      STDIN.getch
-      clear_floating_window_area(x, y, dialog_width, dialog_height)
-      @terminal_ui&.refresh_display
-    end
-
-    def select_from_zoxide_history(history)
-      title = 'Zoxide History'
-      
-      # 履歴を表示用に整形（最大20件）
-      display_history = history.first(20)
-      content_lines = ['']
-      
-      display_history.each_with_index do |entry, index|
-        # パスの表示を短縮（ホームディレクトリを ~ に置換）
-        display_path = entry[:path].gsub(ENV['HOME'], '~')
-        line = "  #{index + 1}. #{display_path}"
-        # 長すぎる場合は切り詰め
-        line = line[0...60] + '...' if line.length > 63
-        content_lines << line
-      end
-      
-      content_lines << ''
-      content_lines << 'Enter number (1-' + display_history.length.to_s + ') or ESC to cancel'
-
-      dialog_width = 70
-      dialog_height = [4 + content_lines.length, 25].min
-      x, y = get_screen_center(dialog_width, dialog_height)
-
-      draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
-                             border_color: "\e[36m", # シアン色
-                             title_color: "\e[1;36m",   # 太字シアン色
-                             content_color: "\e[37m"    # 白色
-                           })
-
-      # 数字入力モード
-      input_buffer = ''
-      
-      loop do
-        char = STDIN.getch
-        
-        case char
-        when "\e", "\x03" # ESC, Ctrl+C
-          clear_floating_window_area(x, y, dialog_width, dialog_height)
-          @terminal_ui&.refresh_display
-          return nil
-        when "\r", "\n" # Enter
-          if !input_buffer.empty?
-            number = input_buffer.to_i
-            if number > 0 && number <= display_history.length
-              selected_entry = display_history[number - 1]
-              clear_floating_window_area(x, y, dialog_width, dialog_height)
-              @terminal_ui&.refresh_display
-              return selected_entry[:path]
-            end
-          end
-          # 無効な入力の場合は再度入力を求める
-          input_buffer = ''
-        when "\u007f", "\b" # Backspace
-          input_buffer = input_buffer[0...-1] unless input_buffer.empty?
-        when /[0-9]/
-          input_buffer += char
-          # 最大2桁まで
-          input_buffer = input_buffer[-2..-1] if input_buffer.length > 2
-          
-          # 入力された数字が範囲内の場合は即座に選択
-          number = input_buffer.to_i
-          if number > 0 && number <= display_history.length && 
-             (number >= 10 || input_buffer.length == 1)
-            selected_entry = display_history[number - 1]
-            clear_floating_window_area(x, y, dialog_width, dialog_height)
-            @terminal_ui&.refresh_display
-            return selected_entry[:path]
-          end
-        end
-      end
-    end
-
-    def navigate_to_zoxide_directory(target_path)
-      return false unless Dir.exist?(target_path)
-
-      # DirectoryListingのnavigate_to_pathメソッドを使用してディレクトリに移動
-      result = @directory_listing.navigate_to_path(target_path)
-      if result
-        @current_index = 0
-        clear_filter_mode
-        
-        # zoxide に移動を記録
-        begin
-          system("zoxide add #{Shellwords.escape(target_path)} > /dev/null 2>&1")
-        rescue StandardError
-          # zoxide add が失敗しても移動は成功として扱う
-        end
-        
-        true
-      else
-        false
-      end
-    end
   end
 end