rufio 1.1.0 → 1.4.0

data/lib/rufio/command_completion.rb

@@ -3,10 +3,18 @@
 module Rufio
   # コマンド補完機能を提供するクラス
   class CommandCompletion
+    # CommandMode が直接処理する（DSL コマンドではない）コマンド
+    NAVIGATION_COMMANDS = %w[cd].freeze
+
     # 初期化
-    # @param history [CommandHistory, nil] コマンド履歴（オプション）
+    # @param history [CommandHistory, CommandMode, nil] 履歴、または単独で渡すコマンドモード
     # @param command_mode [CommandMode, nil] コマンドモード（スクリプト補完に使用）
     def initialize(history = nil, command_mode = nil)
+      # CommandMode だけを渡す従来の呼び方も受け付ける。
+      if history.is_a?(CommandMode) && command_mode.nil?
+        command_mode = history
+        history = nil
+      end
       @command_mode = command_mode || CommandMode.new
       @shell_completion = ShellCommandCompletion.new
       @history = history
@@ -23,6 +31,11 @@ module Rufio
                rake_candidates('')
       end
 
+      # ディレクトリ補完（cd で始まる場合）
+      if (match = input.match(/\A\s*cd\s+(.*)\z/))
+        return complete_cd(match[1])
+      end
+
       # シェルコマンド補完（!で始まる場合）
       if input.strip.start_with?('!')
         return complete_shell_command(input.strip)
@@ -40,7 +53,7 @@ module Rufio
       end
 
       # 通常のコマンド補完（内部コマンド + rakeタスク）
-      available_commands = @command_mode.available_commands.map(&:to_s)
+      available_commands = @command_mode.available_commands.map(&:to_s) + NAVIGATION_COMMANDS
       input_lower = input.downcase
       candidates = available_commands.select do |command|
         command.downcase.start_with?(input_lower)
@@ -82,6 +95,19 @@ module Rufio
     # スクリプト候補を取得（ScriptRunner + ローカルスクリプト）
     # @param prefix [String] 入力中の文字列
     # @return [Array<String>] スクリプト候補（@付き）
+    # :cd のディレクトリ補完。相対パスは閲覧中ディレクトリを基準にする
+    def complete_cd(argument)
+      if argument.start_with?('~', '/') || File.absolute_path?(argument)
+        candidates = @shell_completion.complete_path(argument, directories_only: true)
+      else
+        base = @command_mode.browsing_directory || Dir.pwd
+        prefix = File.join(base, '')
+        candidates = @shell_completion.complete_path(File.join(base, argument), directories_only: true)
+                                      .map { |path| path.delete_prefix(prefix) }
+      end
+      candidates.map { |path| "cd #{path}/" }
+    end
+
     def script_candidates(prefix)
       @command_mode.complete_script("@#{prefix}")
     end

data/lib/rufio/command_history.rb

@@ -5,8 +5,6 @@ module Rufio
   class CommandHistory
     DEFAULT_MAX_SIZE = 1000
 
-    attr_reader :size
-
     # 初期化
     # @param history_file [String] 履歴ファイルのパス
     # @param max_size [Integer] 履歴の最大保存数
@@ -37,6 +35,11 @@ module Rufio
       reset_position
     end
 
+    # 呼び出し側の変更が履歴本体や上下移動の位置に影響しないスナップショット。
+    def entries
+      @history.map(&:dup)
+    end
+
     # 前のコマンドを取得（上矢印キー相当）
     # @return [String, nil] 前のコマンド、存在しない場合はnil
     def previous

data/lib/rufio/command_mode.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
+require_relative 'script_runner'
 
 module Rufio
   # コマンドモード - DSLコマンドを実行するための統一インターフェース
@@ -37,19 +38,14 @@ module Rufio
     # @param config_file [String] 設定ファイルのパス
     # @param job_manager [JobManager] ジョブマネージャー
     def setup_script_path_manager(config_file:, job_manager:)
-      @job_manager = job_manager
       @script_path_manager = ScriptPathManager.new(config_file)
-      # ScriptRunnerも設定（ScriptPathManagerのパスを使用）
-      @script_runner = ScriptRunner.new(
-        script_paths: @script_path_manager.paths,
-        job_manager: job_manager,
-        command_logger: @background_executor&.command_logger
-      )
+      setup_script_runner(script_paths: @script_path_manager.paths, job_manager: job_manager)
     end
 
     # 閲覧中ディレクトリを更新
     # @param directory [String] 現在の閲覧ディレクトリ
     def update_browsing_directory(directory)
+      @browsing_directory = directory
       @local_script_scanner.update_directory(directory)
       @rakefile_parser.update_directory(directory)
     end
@@ -61,6 +57,11 @@ module Rufio
       # 空のコマンドは無視
       return nil if command_string.nil? || command_string.strip.empty?
 
+      # ディレクトリ移動 (cd <path>)。実際の移動は TerminalUI が行う
+      if (match = command_string.strip.match(/\Acd(?:\s+(.*))?\z/m))
+        return resolve_cd(match[1].to_s, working_dir)
+      end
+
       # スクリプト実行 (@ で始まる場合)
       if command_string.strip.start_with?('@')
         return execute_script(command_string.strip[1..-1], working_dir)
@@ -108,6 +109,9 @@ module Rufio
       "⚠️  コマンドが見つかりません: #{command_name}"
     end
 
+    # 閲覧中ディレクトリ（:cd の補完基準）
+    attr_reader :browsing_directory
+
     # 利用可能なコマンドのリストを取得
     def available_commands
       @commands.keys
@@ -190,6 +194,17 @@ module Rufio
     # @param command_name [Symbol] コマンド名
     # @param command [Hash] コマンド情報 { command: DslCommand, source: String }
     # @return [Hash] 実行結果
+    # :cd の引数を移動先に解決する
+    # @return [Hash] { cd: { directory:, file: } } / { cd: :previous }、失敗時はエラーメッセージ
+    def resolve_cd(argument, working_dir)
+      return { cd: :previous } if argument.strip == '-'
+
+      result = PathJump.resolve(argument, working_dir || @browsing_directory || Dir.pwd)
+      return "⚠️  #{result[:error]}" unless result[:directory]
+
+      { cd: { directory: result[:directory], file: result[:file] } }
+    end
+
     def execute_unified_command(command_name, command)
       dsl_cmd = command[:command]
 
@@ -214,27 +229,28 @@ module Rufio
       # コマンドが空の場合
       return { success: false, error: "コマンドが指定されていません" } if shell_command.strip.empty?
 
-      begin
-        # Open3を使って標準出力と標準エラーを分離して取得
-        stdout, stderr, status = Open3.capture3(shell_command)
-
-        result = {
-          success: status.success?,
-          output: stdout.strip,
-          stderr: stderr.strip
-        }
+      run_shell_capture(shell_command)
+    end
 
-        # コマンドが失敗した場合、エラーメッセージを追加
-        unless status.success?
-          result[:error] = "コマンドが失敗しました (終了コード: #{status.exitstatus})"
-        end
+    # Open3.capture3 によるコマンド実行と結果ハッシュの組み立て
+    def run_shell_capture(command, chdir: nil, not_found_label: "コマンド", error_label: "コマンド実行")
+      stdout, stderr, status = if chdir
+                                 Open3.capture3(command, chdir: chdir)
+                               else
+                                 Open3.capture3(command)
+                               end
 
-        result
-      rescue Errno::ENOENT => e
-        { success: false, error: "コマンドが見つかりません: #{e.message}" }
-      rescue StandardError => e
-        { success: false, error: "コマンド実行エラー: #{e.message}" }
-      end
+      result = {
+        success: status.success?,
+        output: stdout.strip,
+        stderr: stderr.strip
+      }
+      result[:error] = "コマンドが失敗しました (終了コード: #{status.exitstatus})" unless status.success?
+      result
+    rescue Errno::ENOENT => e
+      { success: false, error: "#{not_found_label}が見つかりません: #{e.message}" }
+    rescue StandardError => e
+      { success: false, error: "#{error_label}エラー: #{e.message}" }
     end
 
     # スクリプトを実行する（@プレフィックス用）
@@ -276,36 +292,17 @@ module Rufio
     # @param args [String, nil] スクリプトに渡す引数
     # @return [String, Hash] 実行結果メッセージ
     def execute_local_script(script, working_dir, args = nil)
-      command = build_script_command(script)
-      command = "#{command} #{args}" if args && !args.empty?
-
-      if @job_manager
-        job = @job_manager.add_job(
-          name: script[:name],
-          path: working_dir,
-          command: command
-        )
-        job.start
-
-        Thread.new do
-          execute_script_in_background(job, script, working_dir, command)
-        end
-
-        "🚀 ジョブを開始: #{script[:name]}"
-      else
-        # 同期実行
-        stdout, stderr, status = Open3.capture3(command, chdir: working_dir)
-        result = {
-          success: status.success?,
-          output: stdout.strip,
-          stderr: stderr.strip
-        }
-
-        # Logsに記録
-        log_execution("@#{script[:name]}", result)
+      runner = ScriptRunner.new(
+        script_paths: [], job_manager: @job_manager,
+        command_logger: @background_executor&.command_logger
+      )
+      result = runner.execute(script, working_dir: working_dir, args: args)
+      return "🚀 ジョブを開始: #{script[:name]}" if @job_manager
 
-        result
-      end
+      # CommandMode の表示用の戻り値は維持する。
+      result = { success: result[:success], output: result[:output].strip, stderr: result[:error].strip }
+      log_execution("@#{script[:name]}", result)
+      result
     end
 
     # 実行結果をCommandLoggerに記録
@@ -324,59 +321,6 @@ module Rufio
       )
     end
 
-    # スクリプトの実行コマンドを構築
-    # @param script [Hash] スクリプト情報
-    # @return [String] 実行コマンド
-    def build_script_command(script)
-      path = script[:path]
-      ext = File.extname(path).downcase
-
-      case ext
-      when '.rb'
-        "ruby #{path.shellescape}"
-      when '.py'
-        "python3 #{path.shellescape}"
-      when '.js'
-        "node #{path.shellescape}"
-      when '.ts'
-        "ts-node #{path.shellescape}"
-      when '.pl'
-        "perl #{path.shellescape}"
-      when '.ps1'
-        "pwsh #{path.shellescape}"
-      else
-        path.shellescape
-      end
-    end
-
-    # ローカルスクリプトをバックグラウンドで実行
-    def execute_script_in_background(job, script, working_dir, command)
-      stdout, stderr, status = Open3.capture3(command, chdir: working_dir)
-
-      job.append_log(stdout) unless stdout.empty?
-      job.append_log(stderr) unless stderr.empty?
-
-      if status.success?
-        job.complete(exit_code: status.exitstatus)
-      else
-        job.fail(exit_code: status.exitstatus)
-      end
-
-      # Logsに記録
-      log_execution("@#{script[:name]}", {
-        success: status.success?,
-        output: stdout.strip,
-        stderr: stderr.strip
-      })
-
-      @job_manager&.notify_completion(job)
-    rescue StandardError => e
-      job.append_log("Error: #{e.message}")
-      job.fail(exit_code: -1)
-      log_execution("@#{script[:name]}", { success: false, output: '', stderr: e.message })
-      @job_manager&.notify_completion(job)
-    end
-
     # rakeタスクを実行する
     # @param task_name [String] タスク名
     # @param working_dir [String, nil] 作業ディレクトリ
@@ -393,32 +337,14 @@ module Rufio
       working_dir ||= Dir.pwd
       shell_command = "rake #{task_name.shellescape}"
 
-      begin
-        stdout, stderr, status = Open3.capture3(shell_command, chdir: working_dir)
-
-        result = {
-          success: status.success?,
-          output: stdout.strip,
-          stderr: stderr.strip
-        }
-
-        unless status.success?
-          result[:error] = "コマンドが失敗しました (終了コード: #{status.exitstatus})"
-        end
-
-        # Logsに記録
-        log_execution("rake:#{task_name}", result)
-
-        result
-      rescue Errno::ENOENT => e
-        result = { success: false, error: "rakeが見つかりません: #{e.message}" }
-        log_execution("rake:#{task_name}", result)
-        result
-      rescue StandardError => e
-        result = { success: false, error: "rake実行エラー: #{e.message}" }
-        log_execution("rake:#{task_name}", result)
-        result
-      end
+      result = run_shell_capture(
+        shell_command,
+        chdir: working_dir,
+        not_found_label: "rake",
+        error_label: "rake実行"
+      )
+      log_execution("rake:#{task_name}", result)
+      result
     end
 
     # スクリプトパスからスクリプトを検索して実行を試みる

data/lib/rufio/command_mode_ui.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'dialog_support'
+
 require 'io/console'
 
 module Rufio
   # コマンドモードのUI - Tab補完とフローティングウィンドウでの結果表示
   class CommandModeUI
+    include DialogSupport
+
     def initialize(command_mode, dialog_renderer)
       @command_mode = command_mode
       @dialog_renderer = dialog_renderer
@@ -155,48 +159,6 @@ module Rufio
 
     private
 
-    # オーバーレイダイアログを表示してキー入力を待つヘルパーメソッド
-    def show_overlay_dialog(title, content_lines, options = {}, &block)
-      # terminal_ui が利用可能で、screen と renderer が存在する場合のみオーバーレイを使用
-      use_overlay = @terminal_ui &&
-                    @terminal_ui.respond_to?(:screen) &&
-                    @terminal_ui.respond_to?(:renderer) &&
-                    @terminal_ui.screen &&
-                    @terminal_ui.renderer
-
-      if use_overlay
-        # オーバーレイを使用
-        @terminal_ui.show_overlay_dialog(title, content_lines, options, &block)
-      else
-        # フォールバック: 従来の方法
-        width = options[:width]
-        height = options[:height]
-
-        unless width && height
-          width, height = @dialog_renderer.calculate_dimensions(content_lines, {
-            title: title,
-            min_width: options[:min_width] || 40,
-            max_width: options[:max_width] || 80
-          })
-        end
-
-        x, y = @dialog_renderer.calculate_center(width, height)
-
-        @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
-          border_color: options[:border_color] || "\e[37m",
-          title_color: options[:title_color] || "\e[1;33m",
-          content_color: options[:content_color] || "\e[37m"
-        })
-
-        key = block_given? ? yield : STDIN.getch
-
-        @dialog_renderer.clear_area(x, y, width, height)
-        @terminal_ui&.refresh_display
-
-        key
-      end
-    end
-
     # 文字列配列の共通プレフィックスを見つける
     # @param strings [Array<String>] 文字列配列
     # @return [String] 共通プレフィックス

data/lib/rufio/config.rb

@@ -19,147 +19,92 @@ module Rufio
     YAML_CONFIG_PATH = File.join(CONFIG_DIR, 'config.yml').freeze
     LOCAL_YAML_PATH = './rufio.yml'
 
+    # Base English message definitions
+    BASE_MESSAGES = {
+      # Application messages
+      'app.interrupted' => 'rufio interrupted',
+      'app.error_occurred' => 'Error occurred',
+      'app.terminated' => 'rufio terminated',
+
+      # File operations
+      'file.not_found' => 'File not found',
+      'file.not_readable' => 'File not readable',
+      'file.read_error' => 'File read error',
+      'file.binary_file' => 'Binary file',
+      'file.cannot_preview' => 'Cannot preview',
+      'file.encoding_error' => 'Character encoding error - cannot read file',
+      'file.invalid_archive' => 'Invalid ZIP archive',
+      'file.preview_error' => 'Preview error',
+      'file.error_prefix' => 'Error',
+
+      # Keybind messages
+      'keybind.invalid_key' => 'invalid key',
+      'keybind.search_text' => 'Search text: ',
+      'keybind.no_matches' => 'No matches found.',
+      'keybind.press_any_key' => 'Press any key to continue...',
+      'keybind.input_filename' => 'Enter filename: ',
+      'keybind.input_dirname' => 'Enter directory name: ',
+      'keybind.invalid_filename' => 'Invalid filename (cannot contain / or \\)',
+      'keybind.invalid_dirname' => 'Invalid directory name (cannot contain / or \\)',
+      'keybind.file_exists' => 'File already exists',
+      'keybind.directory_exists' => 'Directory already exists',
+      'keybind.file_created' => 'File created',
+      'keybind.directory_created' => 'Directory created',
+      'keybind.creation_error' => 'Creation error',
+
+      # UI messages
+      'ui.operation_prompt' => 'Operation: ',
+
+      # Help text
+      'help.full' => 'j/k:move h:back l:enter o:open g/}:top/bottom G:global-search r:refresh f:filter s:search F:content a/A:create m/p/x:ops b:bookmark z:zoxide 1-9:goto q:quit',
+      'help.short' => 'j/k:move h:back l:enter o:open f:filter s:search b:bookmark z:zoxide 1-9:goto q:quit',
+
+      # Health check messages
+      'health.title' => 'rufio Health Check',
+      'health.ruby_version' => 'Ruby version',
+      'health.required_gems' => 'Required gems',
+      'health.fzf' => 'fzf (file search)',
+      'health.rga' => 'rga (content search)',
+      'health.zoxide' => 'zoxide (directory history)',
+      'health.bat' => 'bat (syntax highlight)',
+      'health.file_opener' => 'System file opener',
+      'health.summary' => 'Summary:',
+      'health.ok' => 'OK',
+      'health.warnings' => 'Warnings',
+      'health.errors' => 'Errors',
+      'health.all_passed' => 'All checks passed! rufio is ready to use.',
+      'health.critical_missing' => 'Some critical components are missing. rufio may not work properly.',
+      'health.optional_missing' => 'Some optional features are unavailable. Basic functionality will work.',
+      'health.all_gems_installed' => 'All required gems installed',
+      'health.missing_gems' => 'Missing gems',
+      'health.gem_install_instruction' => 'Run: gem install',
+      'health.tool_not_found' => 'not found',
+      'health.unknown_platform' => 'Unknown platform',
+      'health.file_open_may_not_work' => 'File opening may not work properly',
+      'health.macos_opener' => 'macOS file opener',
+      'health.linux_opener' => 'Linux file opener',
+      'health.windows_opener' => 'Windows file opener',
+      'health.install_brew' => 'Install: brew install',
+      'health.install_apt' => 'Install: apt install',
+      'health.install_guide' => 'Install: Check the installation guide for your platform',
+      'health.rga_releases' => 'Install: https://github.com/phiresky/ripgrep-all/releases',
+      'health.ruby_upgrade_needed' => 'Please upgrade Ruby to version 2.7.0 or higher'
+    }.freeze
+
     # Multi-language message definitions
     MESSAGES = {
-      'en' => {
-        # Application messages
-        'app.interrupted' => 'rufio interrupted',
-        'app.error_occurred' => 'Error occurred',
-        'app.terminated' => 'rufio terminated',
-
-        # File operations
-        'file.not_found' => 'File not found',
-        'file.not_readable' => 'File not readable',
-        'file.read_error' => 'File read error',
-        'file.binary_file' => 'Binary file',
-        'file.cannot_preview' => 'Cannot preview',
-        'file.encoding_error' => 'Character encoding error - cannot read file',
-        'file.preview_error' => 'Preview error',
-        'file.error_prefix' => 'Error',
-
-        # Keybind messages
-        'keybind.invalid_key' => 'invalid key',
-        'keybind.search_text' => 'Search text: ',
-        'keybind.no_matches' => 'No matches found.',
-        'keybind.press_any_key' => 'Press any key to continue...',
-        'keybind.input_filename' => 'Enter filename: ',
-        'keybind.input_dirname' => 'Enter directory name: ',
-        'keybind.invalid_filename' => 'Invalid filename (cannot contain / or \\)',
-        'keybind.invalid_dirname' => 'Invalid directory name (cannot contain / or \\)',
-        'keybind.file_exists' => 'File already exists',
-        'keybind.directory_exists' => 'Directory already exists',
-        'keybind.file_created' => 'File created',
-        'keybind.directory_created' => 'Directory created',
-        'keybind.creation_error' => 'Creation error',
-
-        # UI messages
-        'ui.operation_prompt' => 'Operation: ',
-
-        # Help text
-        'help.full' => 'j/k:move h:back l:enter o:open g/}:top/bottom G:global-search r:refresh f:filter s:search F:content a/A:create m/p/x:ops b:bookmark z:zoxide 1-9:goto q:quit',
-        'help.short' => 'j/k:move h:back l:enter o:open f:filter s:search b:bookmark z:zoxide 1-9:goto q:quit',
-
-        # Health check messages
-        'health.title' => 'rufio Health Check',
-        'health.ruby_version' => 'Ruby version',
-        'health.required_gems' => 'Required gems',
-        'health.fzf' => 'fzf (file search)',
-        'health.rga' => 'rga (content search)',
-        'health.zoxide' => 'zoxide (directory history)',
-        'health.bat' => 'bat (syntax highlight)',
-        'health.file_opener' => 'System file opener',
-        'health.summary' => 'Summary:',
-        'health.ok' => 'OK',
-        'health.warnings' => 'Warnings',
-        'health.errors' => 'Errors',
-        'health.all_passed' => 'All checks passed! rufio is ready to use.',
-        'health.critical_missing' => 'Some critical components are missing. rufio may not work properly.',
-        'health.optional_missing' => 'Some optional features are unavailable. Basic functionality will work.',
-        'health.all_gems_installed' => 'All required gems installed',
-        'health.missing_gems' => 'Missing gems',
-        'health.gem_install_instruction' => 'Run: gem install',
-        'health.tool_not_found' => 'not found',
-        'health.unknown_platform' => 'Unknown platform',
-        'health.file_open_may_not_work' => 'File opening may not work properly',
-        'health.macos_opener' => 'macOS file opener',
-        'health.linux_opener' => 'Linux file opener',
-        'health.windows_opener' => 'Windows file opener',
-        'health.install_brew' => 'Install: brew install',
-        'health.install_apt' => 'Install: apt install',
-        'health.install_guide' => 'Install: Check the installation guide for your platform',
-        'health.rga_releases' => 'Install: https://github.com/phiresky/ripgrep-all/releases',
-        'health.ruby_upgrade_needed' => 'Please upgrade Ruby to version 2.7.0 or higher'
-      },
-
-      'ja' => {
-        # Application messages
-        'app.interrupted' => 'rufio interrupted',
-        'app.error_occurred' => 'Error occurred',
-        'app.terminated' => 'rufio terminated',
-
-        # File operations
-        'file.not_found' => 'File not found',
-        'file.not_readable' => 'File not readable',
-        'file.read_error' => 'File read error',
-        'file.binary_file' => 'Binary file',
-        'file.cannot_preview' => 'Cannot preview',
+      'en' => BASE_MESSAGES,
+      'ja' => BASE_MESSAGES.merge(
         'file.encoding_error' => 'Encoding error - cannot read file',
-        'file.preview_error' => 'Preview error',
-        'file.error_prefix' => 'Error',
-
-        # Keybind messages
         'keybind.invalid_key' => 'Invalid key',
         'keybind.search_text' => 'Search: ',
-        'keybind.no_matches' => 'No matches found.',
-        'keybind.press_any_key' => 'Press any key to continue...',
-        'keybind.input_filename' => 'Enter filename: ',
-        'keybind.input_dirname' => 'Enter directory name: ',
-        'keybind.invalid_filename' => 'Invalid filename (cannot contain / or \\)',
-        'keybind.invalid_dirname' => 'Invalid directory name (cannot contain / or \\)',
-        'keybind.file_exists' => 'File already exists',
-        'keybind.directory_exists' => 'Directory already exists',
-        'keybind.file_created' => 'File created',
-        'keybind.directory_created' => 'Directory created',
-        'keybind.creation_error' => 'Creation error',
-
-        # UI messages
-        'ui.operation_prompt' => 'Operation: ',
-
-        # Help text
         'help.full' => 'j/k:move h:back l:enter o:open g/}:top/end G:global-search r:refresh f:filter s:search F:content a/A:create m/c/x:ops b:bookmark z:zoxide 1-9:jump q:quit',
         'help.short' => 'j/k:move h:back l:enter o:open f:filter s:search b:bookmark z:zoxide 1-9:jump q:quit',
-
-        # Health check messages
-        'health.title' => 'rufio Health Check',
-        'health.ruby_version' => 'Ruby version',
-        'health.required_gems' => 'Required gems',
-        'health.fzf' => 'fzf (file search)',
-        'health.rga' => 'rga (content search)',
-        'health.zoxide' => 'zoxide (directory history)',
-        'health.bat' => 'bat (syntax highlight)',
-        'health.file_opener' => 'System file opener',
-        'health.summary' => 'Summary:',
-        'health.ok' => 'OK',
-        'health.warnings' => 'Warnings',
-        'health.errors' => 'Errors',
-        'health.all_passed' => 'All checks passed! rufio is ready to use.',
         'health.critical_missing' => 'Critical components missing. rufio may not work properly.',
         'health.optional_missing' => 'Optional features unavailable. Basic features will work.',
         'health.all_gems_installed' => 'All required gems are installed',
-        'health.missing_gems' => 'Missing gems',
-        'health.gem_install_instruction' => 'Run: gem install',
-        'health.tool_not_found' => 'not found',
-        'health.unknown_platform' => 'Unknown platform',
-        'health.file_open_may_not_work' => 'File open may not work properly',
-        'health.macos_opener' => 'macOS file opener',
-        'health.linux_opener' => 'Linux file opener',
-        'health.windows_opener' => 'Windows file opener',
-        'health.install_brew' => 'Install: brew install',
-        'health.install_apt' => 'Install: apt install',
-        'health.install_guide' => 'Install: Check the installation guide for your platform',
-        'health.rga_releases' => 'Install: https://github.com/phiresky/ripgrep-all/releases',
-        'health.ruby_upgrade_needed' => 'Please upgrade Ruby to version 2.7.0 or higher'
-      }
+        'health.file_open_may_not_work' => 'File open may not work properly'
+      ).freeze
     }.freeze
 
     class << self
@@ -272,14 +217,21 @@ module Rufio
         return [] unless File.exist?(path)
 
         yaml = YAML.safe_load(File.read(path), symbolize_names: true)
-        return [] unless yaml.is_a?(Array)
-
-        yaml.select { |b| b.is_a?(Hash) && b[:path] && b[:name] }
+        filter_valid_bookmarks(yaml)
       rescue StandardError => e
         warn "Failed to load bookmarks: #{e.message}"
         []
       end
 
+      # 有効なブックマーク要素のみを抽出
+      # @param bookmarks [Array<Hash>] ブックマーク配列
+      # @return [Array<Hash>] フィルタ済みブックマーク配列
+      def filter_valid_bookmarks(bookmarks)
+        return [] unless bookmarks.is_a?(Array)
+
+        bookmarks.select { |b| b.is_a?(Hash) && b[:path] && b[:name] }
+      end
+
       # ブックマークを保存
       # @param path [String] YAMLファイルのパス
       # @param bookmarks [Array<Hash>] ブックマーク配列
@@ -398,9 +350,9 @@ module Rufio
       end
 
       def detect_language
-        # Only BENIYA_LANG environment variable takes precedence
+        # RUFIO_LANG or BENIYA_LANG (legacy) environment variable takes precedence
         # This ensures English is default unless explicitly requested
-        env_lang = ENV['BENIYA_LANG']
+        env_lang = ENV['RUFIO_LANG'] || ENV['BENIYA_LANG']
         
         if env_lang && !env_lang.empty?
           # Extract language code (e.g., 'ja_JP.UTF-8' -> 'ja')