rufio 0.21.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2273fb7a1731d8d60e7a617d9055bdff0f7f5cd92f85eaa36d91dd266cf01773
-  data.tar.gz: e599d21775fd19631fca769972977f3a98771afae998b2523e16cf84d2b30d12
+  metadata.gz: 8f639904d46c7c6cff1424a06e22df2ec476aab1e575a442a47a329af208c555
+  data.tar.gz: 4f682afe7f35715ae18b4fcdc08efef03d00677c621d0422567a23d897b6b30b
 SHA512:
-  metadata.gz: 7c66f9c83af723f5a993bfdec6e68b801320394e0912d94431986747e36f86cceea8afc0fa63fc345f2f1a045c1eb8753fb9e1cc238762a49e4f4d5f162f8cb4
-  data.tar.gz: 36c12657770e86c3f36054a735761db1e0207bbf70b2a89588b988f33fffc42ed2c00e00ace7595a7f9cc93ed95c3ad1097bbafb732db14d488727417b859345
+  metadata.gz: 8f6ee453b1868123c11d987244735ce092088f7b720dc6f445e21aed0b191e25b47501ff003720647dc17343accdefd88a72b0dfaf69ca644a160e693ec1a1cf
+  data.tar.gz: d1ddf57189b941111a314f11c5b6dbcddbda54d96e6fef4eccb8b7a7fec27a9903ca6b29d66e62181a2d98fe5009026ca2609620cef370eba680851cb710ec31

data/CHANGELOG_v0.30.0.md

@@ -0,0 +1,148 @@
+# Changelog - v0.30.0
+
+## Release Date: 2025-12-30
+
+## New Features & Improvements
+
+### Help System Overhaul
+
+#### Help Mode (Press `?`)
+- **Full-screen help mode** instead of popup dialog
+  - Browse help documentation files in `info/` directory
+  - Uses normal file manager UI for navigation
+  - Navigation restricted to `info/` directory (cannot go to parent)
+  - Press `ESC` to exit help mode and return to previous directory
+
+#### Help Documentation
+- Converted all help files to **Markdown format** (`.md`)
+- **Unified language**: All documentation now in English
+- Created comprehensive help files:
+  - `info/welcome.md` - Introduction and quick start guide
+  - `info/help.md` - Complete feature documentation with table of contents
+  - `info/keybindings.md` - Full keybindings reference organized by category
+
+### Preview Pane Scrolling
+
+#### Enter Key Behavior Change
+- Press `Enter` on a **file** to focus preview pane (instead of doing nothing)
+- Press `Enter` on a **directory** to navigate into it (unchanged)
+- Preview pane shows `[PREVIEW MODE]` indicator when focused
+
+#### Scroll Controls in Preview Mode
+- `j` / `↓` : Scroll down one line
+- `k` / `↑` : Scroll up one line
+- `Ctrl+D` : Scroll down half page (20 lines)
+- `Ctrl+U` : Scroll up half page (20 lines)
+- `ESC` : Exit preview mode and return focus to directory list
+
+#### Smart Scroll Management
+- Scroll position automatically resets when changing files
+- Scroll position cannot go below zero
+- Works in both **normal mode** and **help mode**
+
+### UI Improvements
+
+#### Footer Enhancements
+- **Bookmark list with numbers**: `0.dirname 1.bookmark1 2.bookmark2 ...`
+- **Bookmark 0**: Jump to startup directory with `0` key
+- **Processing time**: Display render time in milliseconds
+- **Help hint**: `?:help` shown on the right side
+- Removed time and version display from footer (simplified layout)
+
+#### Project Mode Improvements
+- Bookmark list displays with numbers: `1. project1`, `2. project2`, etc.
+- Improved consistency with bookmark number navigation
+
+### Header Improvements
+- Help mode indicator: `[Help Mode - Press ESC to exit]`
+- Version information moved to help dialog
+
+## Technical Changes
+
+### New Methods
+
+**KeybindHandler**:
+- `help_mode?` - Check if help mode is active
+- `enter_help_mode` - Enter help mode (navigate to `info/` directory)
+- `exit_help_mode` - Exit help mode and return to previous directory
+- `navigate_parent_with_restriction` - Navigate parent with `info/` directory restriction
+- `preview_focused?` - Check if preview pane is focused
+- `focus_preview_pane` - Focus preview pane (file only)
+- `unfocus_preview_pane` - Unfocus preview pane
+- `preview_scroll_offset` - Get current scroll offset
+- `scroll_preview_down` - Scroll preview down one line
+- `scroll_preview_up` - Scroll preview up one line
+- `scroll_preview_page_down` - Scroll preview down half page (Ctrl+D)
+- `scroll_preview_page_up` - Scroll preview up half page (Ctrl+U)
+- `reset_preview_scroll` - Reset scroll position
+- `handle_enter_key` - Handle Enter key (focus preview or navigate)
+- `handle_preview_focus_key` - Handle keys in preview mode
+
+**TerminalUI**:
+- `draw_header` - Updated to show help mode indicator
+- `draw_footer` - Updated to show bookmarks with numbers and processing time
+- `draw_file_preview` - Updated to apply scroll offset and show preview mode indicator
+
+### Modified Behavior
+
+**Keybindings**:
+- `?` - Enter help mode (was: show help dialog)
+- `Enter` - Focus preview pane on files / Navigate on directories (was: navigate only)
+- `h` - Navigate parent with restriction in help mode (was: unrestricted)
+- `ESC` - Exit help mode or unfocus preview pane (was: clear filter only)
+
+**Directory Navigation**:
+- `DirectoryListing#initialize` - Save startup directory as `start_directory`
+- `KeybindHandler#goto_start_directory` - Jump to startup directory with `0` key
+
+### Layout Constants
+- `HEADER_FOOTER_MARGIN = 3` - Header + Footer (2-line layout)
+
+## Usage Guide
+
+### Help Mode
+1. Press `?` to enter help mode
+2. Navigate help files using `j/k/h/l` keys
+3. Press `Enter` or `l` to view a help file
+4. Press `h` to go back (restricted to `info/` directory)
+5. Press `ESC` to exit help mode
+
+### Preview Scrolling
+1. Select a file with `j/k` keys
+2. Press `Enter` to focus preview pane
+3. Use `j/k` or arrow keys to scroll line by line
+4. Use `Ctrl+D` / `Ctrl+U` for page scrolling
+5. Press `ESC` to return to directory list
+
+### Bookmarks
+- `b` - Add current directory to bookmarks
+- `0` - Jump to startup directory
+- `1-9` - Jump to bookmarks 1-9
+- `p` - Enter project mode (browse all bookmarks)
+
+## Testing
+
+### New Test Files
+- `test/test_help_mode.rb` - Help mode functionality tests
+- `test/test_preview_scroll.rb` - Preview scrolling tests
+
+### Test Results
+- **329 tests** passing
+- **1444 assertions**
+- **0 failures**
+- **0 errors**
+
+## Compatibility
+
+- Ruby 3.0 or higher
+- Maintains compatibility with existing configuration files
+- Maintains compatibility with existing bookmark data
+- All help files now in English (breaking change for Japanese users)
+
+## Known Issues
+
+None
+
+---
+
+**Full Changelog**: v0.21.0...v0.30.0

data/README.md

@@ -21,6 +21,9 @@ rufioは、Yaziにインスパイアされたターミナル上で動作する
 - **マルチプラットフォーム**: macOS、Linux、Windowsで動作
 - **外部エディタ連携**: お気に入りのエディタでファイルを開く
 - **ヘルスチェック**: システム依存関係の確認機能
+- **ステータスバー**: 処理時間、現在時刻、バージョン情報をリアルタイム表示
+- **ブックマーク一覧表示**: フッタに1-9のブックマークを番号付きで表示
+- **統合ヘルプシステム**: ？キーでキーバインド一覧とお知らせを表示
 
 ## インストール
 
@@ -113,6 +116,7 @@ rufio --help           # ヘルプメッセージを表示
 | --------- | ------------------------------------ |
 | `b`       | 現在のディレクトリをブックマークに追加 |
 | `p`       | プロジェクトモードに入る             |
+| `0`       | 起動したディレクトリに移動           |
 | `1`-`9`   | 対応する番号のブックマークに移動     |
 
 #### zoxide連携機能
@@ -130,6 +134,12 @@ rufio --help           # ヘルプメッセージを表示
 | `Enter`| コマンドを実行（コマンドモード中）       |
 | `ESC`  | コマンドモードをキャンセル（コマンドモード中） |
 
+#### ヘルプ
+
+| キー | 機能                               |
+| ---- | ---------------------------------- |
+| `?`  | キーバインド一覧とお知らせを表示 |
+
 #### システム操作
 
 | キー | 機能         |

data/info/help.md

@@ -0,0 +1,111 @@
+# rufio Help
+
+**rufio** is a terminal-based file manager inspired by Yazi.
+
+## Table of Contents
+
+- [Basic Operations](#basic-operations)
+- [Navigation](#navigation)
+- [File Operations](#file-operations)
+- [File Selection & Bulk Operations](#file-selection--bulk-operations)
+- [Filtering & Search](#filtering--search)
+- [Bookmarks](#bookmarks)
+- [Other Features](#other-features)
+
+---
+
+## Basic Operations
+
+### Navigation
+
+| Key | Action |
+|-----|--------|
+| `j` or `↓` | Move down one item |
+| `k` or `↑` | Move up one item |
+| `h` or `←` | Go to parent directory |
+| `l`, `Enter`, or `→` | Enter directory / Select file |
+| `g` | Jump to top of list |
+| `G` | Jump to bottom of list |
+
+### File Operations
+
+| Key | Action |
+|-----|--------|
+| `o` | Open file with external editor |
+| `e` | Open in file explorer |
+| `R` | Refresh directory contents |
+| `r` | Rename file or directory |
+| `d` | Delete file or directory (with confirmation) |
+| `a` | Create new file |
+| `A` | Create new directory |
+
+### File Selection & Bulk Operations
+
+| Key | Action |
+|-----|--------|
+| `Space` | Toggle file/directory selection |
+| `m` | Move selected items to current directory |
+| `c` | Copy selected items to current directory |
+| `x` | Delete selected items |
+
+### Filtering & Search
+
+| Key | Action |
+|-----|--------|
+| `f` | Start filter mode |
+| `s` | Search file names with fzf |
+| `F` | Search file contents with rga (ripgrep-all) |
+
+**Filter Mode:**
+- Type characters to filter files in real-time
+- Press `Enter` to apply filter and exit filter mode
+- Press `ESC` to cancel and clear filter
+
+### Bookmarks
+
+| Key | Action |
+|-----|--------|
+| `b` | Add current directory to bookmarks |
+| `0` | Jump to startup directory |
+| `1-9` | Jump to bookmark 1-9 |
+| `p` | Enter project mode (browse bookmarks) |
+
+**Project Mode:**
+- Browse all bookmarks with normal navigation keys
+- Press `Space` to select a bookmark and jump to it
+- Press `ESC` to exit project mode
+
+### Other Features
+
+| Key | Action |
+|-----|--------|
+| `z` | Navigate using zoxide history |
+| `:` | Enter command mode |
+| `?` | Enter help mode (this mode) |
+| `ESC` | Exit help mode / Cancel filter |
+| `q` | Quit rufio |
+
+---
+
+## Help Mode
+
+You are currently in **Help Mode**. In this mode:
+
+- Navigate through help files using normal keys (`j/k/h/l`)
+- Press `l` or `Enter` to view a help file
+- Press `h` to go back (restricted to `info/` directory)
+- Press `ESC` to exit help mode and return to your previous directory
+
+---
+
+## Tips
+
+1. **Quick navigation**: Use `g` and `G` to jump to top/bottom
+2. **Bulk operations**: Select multiple files with `Space`, then use `m/c/x`
+3. **Filter + Search**: Use `f` for real-time filtering, `s` for fuzzy search
+4. **Bookmarks**: Save frequently used directories with `b`, access with `1-9`
+5. **Project mode**: Press `p` to see all bookmarks at once
+
+---
+
+For more information, visit: https://github.com/masisz/rufio

data/info/keybindings.md

@@ -0,0 +1,102 @@
+# Keybindings Reference
+
+Complete reference of all keyboard shortcuts in **rufio**.
+
+## Navigation
+
+| Key | Action |
+|-----|--------|
+| `j` / `↓` | Move down |
+| `k` / `↑` | Move up |
+| `h` / `←` | Go to parent directory |
+| `l` / `→` / `Enter` | Enter directory or select file |
+| `g` | Jump to top of list |
+| `G` | Jump to bottom of list |
+
+## File Operations
+
+| Key | Action |
+|-----|--------|
+| `o` | Open file with external editor |
+| `e` | Open in file explorer (system default) |
+| `R` | Refresh directory contents |
+| `r` | Rename file or directory |
+| `d` | Delete file or directory (with confirmation) |
+| `a` | Create new file |
+| `A` | Create new directory |
+
+## File Selection
+
+| Key | Action |
+|-----|--------|
+| `Space` | Toggle selection on current item |
+| `m` | Move selected items to current directory |
+| `c` | Copy selected items to current directory |
+| `x` | Delete selected items |
+
+## Filtering & Search
+
+| Key | Action |
+|-----|--------|
+| `f` | Enter filter mode (type to filter) |
+| `s` | Search file names with fzf |
+| `F` | Search file contents with rga |
+
+## Bookmarks
+
+| Key | Action |
+|-----|--------|
+| `b` | Add current directory to bookmarks |
+| `0` | Jump to startup directory |
+| `1` | Jump to bookmark 1 |
+| `2` | Jump to bookmark 2 |
+| `3` | Jump to bookmark 3 |
+| `4` | Jump to bookmark 4 |
+| `5` | Jump to bookmark 5 |
+| `6` | Jump to bookmark 6 |
+| `7` | Jump to bookmark 7 |
+| `8` | Jump to bookmark 8 |
+| `9` | Jump to bookmark 9 |
+| `p` | Enter project mode (browse all bookmarks) |
+
+## Other
+
+| Key | Action |
+|-----|--------|
+| `z` | Navigate using zoxide history |
+| `:` | Enter command mode |
+| `?` | Enter help mode |
+| `ESC` | Exit current mode (help/filter/project) |
+| `q` | Quit rufio |
+
+---
+
+## Mode-Specific Keys
+
+### Filter Mode
+- **Any character**: Add to filter query
+- **Backspace**: Remove last character
+- **Enter**: Apply filter and exit filter mode
+- **ESC**: Cancel filter and exit filter mode
+
+### Project Mode
+- **j/k**: Navigate through bookmarks
+- **Space**: Select bookmark and jump to directory
+- **ESC**: Exit project mode
+
+### Help Mode
+- **j/k/h/l**: Navigate help files
+- **ESC**: Exit help mode and return to previous directory
+
+---
+
+## Tips
+
+- **Vim users**: Navigation keys (`hjkl`) work exactly like Vim
+- **Selection**: Use `Space` to mark multiple files, then operate on all at once
+- **Quick access**: Number keys `1-9` provide instant access to bookmarks
+- **Filtering**: Press `f` and start typing for real-time filtering
+
+---
+
+*Press `?` anytime to return to help mode*

data/info/welcome.md

@@ -0,0 +1,40 @@
+# Welcome to rufio! 🚀
+
+Thank you for using **rufio** - a terminal-based file manager inspired by [Yazi](https://github.com/sxyazi/yazi).
+
+## Key Features
+
+- **Vim-like keybindings** - Navigate with `j/k/h/l` keys
+- **Real-time filtering** - Press `f` to filter files instantly
+- **Advanced search** - Use `fzf` for file names and `rga` for content search
+- **Bookmark support** - Quick access to favorite directories with number keys
+- **Project mode** - Manage multiple projects efficiently
+- **Plugin system** - Extend functionality with custom plugins
+
+## Quick Start
+
+| Key | Action |
+|-----|--------|
+| `j/k` | Move down/up |
+| `h/l` | Go to parent / Enter directory |
+| `f` | Filter files |
+| `b` | Add bookmark |
+| `p` | Project mode |
+| `?` | Help mode |
+| `:` | Command mode |
+| `q` | Quit |
+
+## Getting Help
+
+Press `?` to enter **Help Mode** where you can browse all documentation files.
+Press `ESC` to exit Help Mode.
+
+## More Information
+
+Visit the GitHub repository for detailed documentation:
+- **Repository**: https://github.com/masisz/rufio
+- **Issues**: https://github.com/masisz/rufio/issues
+
+---
+
+*Happy file managing! 📁*

data/lib/rufio/directory_listing.rb

@@ -4,10 +4,11 @@ require 'fileutils'
 
 module Rufio
   class DirectoryListing
-    attr_reader :current_path
+    attr_reader :current_path, :start_directory
 
     def initialize(path = Dir.pwd)
       @current_path = File.expand_path(path)
+      @start_directory = @current_path  # 起動時のディレクトリを保存
       @entries = []
       refresh
     end

data/lib/rufio/keybind_handler.rb

@@ -51,6 +51,14 @@ module Rufio
       @project_log = ProjectLog.new(log_dir)
       @in_project_mode = false
       @in_log_mode = false
+
+      # Help mode
+      @in_help_mode = false
+      @pre_help_directory = nil
+
+      # Preview pane focus and scroll
+      @preview_focused = false
+      @preview_scroll_offset = 0
     end
 
     def set_directory_listing(directory_listing)
@@ -85,6 +93,16 @@ module Rufio
         return handle_project_mode_key(key)
       end
 
+      # プレビューペインフォーカス中の特別処理
+      if @preview_focused
+        return handle_preview_focus_key(key)
+      end
+
+      # ヘルプモード中のESCキー特別処理
+      if @in_help_mode && key == "\e"
+        return exit_help_mode
+      end
+
       # フィルターモード中は他のキーバインドを無効化
       return handle_filter_input(key) if @filter_manager.filter_mode
 
@@ -94,9 +112,11 @@ module Rufio
       when 'k'
         move_up
       when 'h'
-        navigate_parent
-      when 'l', "\r", "\n" # l, Enter
+        navigate_parent_with_restriction
+      when 'l'  # l - navigate into directory
         navigate_enter
+      when "\r", "\n"  # Enter - focus preview pane or navigate
+        handle_enter_key
       when 'g'
         move_to_top
       when 'G'
@@ -153,8 +173,12 @@ module Rufio
         add_bookmark
       when 'z'  # z - zoxide history navigation
         show_zoxide_menu
+      when '0'  # 0 - go to start directory
+        goto_start_directory
       when '1', '2', '3', '4', '5', '6', '7', '8', '9'  # number keys - go to bookmark
         goto_bookmark(key.to_i)
+      when '?'  # ? - enter help mode
+        enter_help_mode
       when ':'  # : - command mode
         activate_command_mode
       else
@@ -184,16 +208,197 @@ module Rufio
       end
     end
 
+    # ヘルプモード関連メソッド
+
+    # ヘルプモード中かどうか
+    def help_mode?
+      @in_help_mode
+    end
+
+    # ヘルプモードに入る
+    def enter_help_mode
+      return false unless @directory_listing
+
+      # 現在のディレクトリを保存
+      @pre_help_directory = @directory_listing.current_path
+
+      # info ディレクトリに移動
+      rufio_root = File.expand_path('../..', __dir__)
+      info_dir = File.join(rufio_root, 'info')
+
+      # info ディレクトリが存在することを確認
+      return false unless Dir.exist?(info_dir)
+
+      # ヘルプモードを有効化
+      @in_help_mode = true
+
+      # info ディレクトリに移動
+      navigate_to_directory(info_dir)
+
+      true
+    end
+
+    # ヘルプモードを終了
+    def exit_help_mode
+      return false unless @in_help_mode
+      return false unless @pre_help_directory
+
+      # ヘルプモードを無効化
+      @in_help_mode = false
+
+      # 元のディレクトリに戻る
+      navigate_to_directory(@pre_help_directory)
+
+      # 保存したディレクトリをクリア
+      @pre_help_directory = nil
+
+      true
+    end
+
+    # ヘルプモード時の制限付き親ディレクトリナビゲーション
+    def navigate_parent_with_restriction
+      if @in_help_mode
+        # info ディレクトリより上には移動できない
+        rufio_root = File.expand_path('../..', __dir__)
+        info_dir = File.join(rufio_root, 'info')
+
+        current_path = @directory_listing.current_path
+
+        # 現在のパスが info ディレクトリ以下でない場合は移動を許可しない
+        unless current_path.start_with?(info_dir)
+          return false
+        end
+
+        # 現在のパスが info ディレクトリそのものの場合は移動を許可しない
+        if current_path == info_dir
+          return false
+        end
+
+        # info ディレクトリ配下であれば、通常のナビゲーションを実行
+        navigate_parent
+      else
+        # ヘルプモード外では通常のナビゲーション
+        navigate_parent
+      end
+    end
+
+    # プレビューペイン関連メソッド
+
+    # プレビューペインがフォーカスされているか
+    def preview_focused?
+      @preview_focused
+    end
+
+    # プレビューペインにフォーカスを移す
+    def focus_preview_pane
+      # ファイルが選択されている場合のみフォーカス可能
+      entry = current_entry
+      return false unless entry
+      return false unless entry[:type] == 'file'
+
+      @preview_focused = true
+      @preview_scroll_offset = 0  # フォーカス時にスクロール位置をリセット
+      true
+    end
+
+    # プレビューペインのフォーカスを解除
+    def unfocus_preview_pane
+      return false unless @preview_focused
+
+      @preview_focused = false
+      true
+    end
+
+    # 現在のプレビュースクロールオフセット
+    def preview_scroll_offset
+      @preview_scroll_offset
+    end
+
+    # プレビューを1行下にスクロール
+    def scroll_preview_down
+      return false unless @preview_focused
+
+      @preview_scroll_offset += 1
+      true
+    end
+
+    # プレビューを1行上にスクロール
+    def scroll_preview_up
+      return false unless @preview_focused
+
+      @preview_scroll_offset = [@preview_scroll_offset - 1, 0].max
+      true
+    end
+
+    # プレビューを半画面下にスクロール（Ctrl+D）
+    def scroll_preview_page_down
+      return false unless @preview_focused
+
+      # 半画面分スクロール（仮に20行とする）
+      page_size = 20
+      @preview_scroll_offset += page_size
+      true
+    end
+
+    # プレビューを半画面上にスクロール（Ctrl+U）
+    def scroll_preview_page_up
+      return false unless @preview_focused
+
+      # 半画面分スクロール（仮に20行とする）
+      page_size = 20
+      @preview_scroll_offset = [@preview_scroll_offset - page_size, 0].max
+      true
+    end
+
+    # プレビュースクロール位置をリセット（ファイル変更時など）
+    def reset_preview_scroll
+      @preview_scroll_offset = 0
+    end
+
     private
 
+    # Enterキーの処理：ファイルならプレビューフォーカス、ディレクトリならナビゲート
+    def handle_enter_key
+      entry = current_entry
+      return false unless entry
+
+      if entry[:type] == 'file'
+        # ファイルの場合はプレビューペインにフォーカス
+        focus_preview_pane
+      else
+        # ディレクトリの場合は通常のナビゲーション
+        navigate_enter
+      end
+    end
+
+    # プレビューペインフォーカス中のキー処理
+    def handle_preview_focus_key(key)
+      case key
+      when 'j', "\e[B"  # j or Down arrow
+        scroll_preview_down
+      when 'k', "\e[A"  # k or Up arrow
+        scroll_preview_up
+      when "\x04"  # Ctrl+D
+        scroll_preview_page_down
+      when "\x15"  # Ctrl+U
+        scroll_preview_page_up
+      when "\e"  # ESC
+        unfocus_preview_pane
+      else
+        false  # Unknown key in preview mode
+      end
+    end
+
     def move_down
       entries = get_active_entries
       @current_index = [@current_index + 1, entries.length - 1].min
+      reset_preview_scroll  # ファイル変更時にスクロール位置をリセット
       true
     end
 
     def move_up
       @current_index = [@current_index - 1, 0].max
+      reset_preview_scroll  # ファイル変更時にスクロール位置をリセット
       true
     end
 
@@ -1012,20 +1217,22 @@ module Rufio
       end
     end
 
+    def goto_start_directory
+      start_dir = @directory_listing&.start_directory
+      return false unless start_dir
+
+      # 起動ディレクトリに移動
+      navigate_to_directory(start_dir)
+    end
+
     def goto_bookmark(number)
       bookmark = @bookmark_manager.find_by_number(number)
 
-      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)
+      return false unless bookmark
+      return false 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
-        show_error_and_wait('bookmark.navigate_failed', bookmark[:name])
-      end
+      navigate_to_directory(bookmark[:path])
     end
 
     def add_bookmark
@@ -1405,5 +1612,11 @@ module Rufio
     def in_log_mode?
       @in_log_mode
     end
+
+    # ヘルプダイアログを表示
+    def show_help_dialog
+      @terminal_ui&.show_help_dialog if @terminal_ui
+      true
+    end
   end
 end

data/lib/rufio/terminal_ui.rb

@@ -7,7 +7,7 @@ module Rufio
   class TerminalUI
     # Layout constants
     HEADER_HEIGHT = 1              # Header占有行数
-    FOOTER_HEIGHT = 1              # Footer占有行数
+    FOOTER_HEIGHT = 1              # Footer占有行数（ブックマーク一覧 + ステータス情報）
     HEADER_FOOTER_MARGIN = 3       # Header + Footer分のマージン
 
     # Panel layout ratios
@@ -115,6 +115,9 @@ module Rufio
     end
 
     def draw_screen
+      # 処理時間測定開始
+      start_time = Time.now
+
       # move cursor to top of screen (don't clear)
       print "\e[H"
 
@@ -142,8 +145,9 @@ module Rufio
       draw_directory_list(entries, left_width, content_height)
       draw_file_preview(selected_entry, right_width, content_height, left_width)
 
-      # footer
-      draw_footer
+      # footer (統合されたステータス情報を含む)
+      render_time = Time.now - start_time
+      draw_footer(render_time)
 
       # コマンドモードがアクティブな場合はコマンド入力ウィンドウを表示
       if @command_mode_active
@@ -161,6 +165,11 @@ module Rufio
       current_path = @directory_listing.current_path
       header = "📁 rufio - #{current_path}"
 
+      # Add help mode indicator if in help mode
+      if @keybind_handler.help_mode?
+        header += " [Help Mode - Press ESC to exit]"
+      end
+
       # Add filter indicator if in filter mode
       if @keybind_handler.filter_active?
         filter_text = " [Filter: #{@keybind_handler.filter_query}]"
@@ -169,7 +178,12 @@ module Rufio
 
       # abbreviate if path is too long
       if header.length > @screen_width - HEADER_PADDING
-        if @keybind_handler.filter_active?
+        if @keybind_handler.help_mode?
+          # prioritize showing help mode indicator
+          help_text = " [Help Mode - Press ESC to exit]"
+          base_length = @screen_width - help_text.length - FILTER_TEXT_RESERVED
+          header = "📁 rufio - ...#{current_path[-base_length..-1]}#{help_text}"
+        elsif @keybind_handler.filter_active?
           # prioritize showing filter when active
           filter_text = " [Filter: #{@keybind_handler.filter_query}]"
           base_length = @screen_width - filter_text.length - FILTER_TEXT_RESERVED
@@ -310,12 +324,19 @@ module Rufio
         if selected_entry && i == 0
           # プレビューヘッダー
           header = " #{selected_entry[:name]} "
+          # プレビューフォーカス中は表示を追加
+          if @keybind_handler&.preview_focused?
+            header += "[PREVIEW MODE]"
+          end
           content_to_print = header
         elsif selected_entry && selected_entry[:type] == 'file' && i >= 2
           # ファイルプレビュー（折り返し対応）
           preview_content = get_preview_content(selected_entry)
           wrapped_lines = TextUtils.wrap_preview_lines(preview_content, safe_width - 1) # スペース分を除く
-          display_line_index = i - 2
+
+          # スクロールオフセットを適用
+          scroll_offset = @keybind_handler&.preview_scroll_offset || 0
+          display_line_index = i - 2 + scroll_offset
 
           if display_line_index < wrapped_lines.length
             line = wrapped_lines[display_line_index] || ''
@@ -376,9 +397,9 @@ module Rufio
       end
     end
 
-    def draw_footer
-      # 最下行から1行上に表示してスクロールを避ける
-      footer_line = @screen_height - FOOTER_HEIGHT
+    def draw_footer(render_time = nil)
+      # フッタは最下行に表示
+      footer_line = @screen_height - FOOTER_HEIGHT + 1
       print "\e[#{footer_line};1H"
 
       if @keybind_handler.filter_active?
@@ -387,14 +408,50 @@ module Rufio
         else
           help_text = "Filtered view active - Space to edit filter, ESC to clear filter"
         end
+        # フィルタモードでは通常のフッタを表示
+        footer_content = help_text.ljust(@screen_width)[0...@screen_width]
+        print "\e[7m#{footer_content}\e[0m"
       else
-        help_text = ConfigLoader.message('help.full')
-        help_text = ConfigLoader.message('help.short') if help_text.length > @screen_width
-      end
+        # 通常モードではブックマーク一覧、ステータス情報、?:helpを1行に表示
+        require_relative 'bookmark'
+        bookmark = Bookmark.new
+        bookmarks = bookmark.list
+
+        # 起動ディレクトリを取得
+        start_dir = @directory_listing&.start_directory
+        start_dir_name = if start_dir
+                           File.basename(start_dir)
+                         else
+                           "start"
+                         end
+
+        # ブックマーク一覧を作成（0.起動dir を先頭に追加）
+        bookmark_parts = ["0.#{start_dir_name}"]
+        unless bookmarks.empty?
+          bookmark_parts.concat(bookmarks.take(9).map.with_index(1) { |bm, idx| "#{idx}.#{bm[:name]}" })
+        end
+        bookmark_text = bookmark_parts.join(" ")
 
-      # 文字列を確実に画面幅に合わせる
-      footer_content = help_text.ljust(@screen_width)[0...@screen_width]
-      print "\e[7m#{footer_content}\e[0m"
+        # ステータス情報を作成
+        time_info = render_time ? "#{(render_time * 1000).round(1)}ms" : "-ms"
+
+        # 右側の情報: 処理時間 | ?:help
+        right_info = "#{time_info} | ?:help"
+
+        # ブックマーク一覧を利用可能な幅に収める
+        available_width = @screen_width - right_info.length - 3
+        if bookmark_text.length > available_width && available_width > 3
+          bookmark_text = bookmark_text[0...available_width - 3] + "..."
+        elsif available_width <= 3
+          bookmark_text = ""
+        end
+
+        # フッタ全体を構築
+        padding = @screen_width - bookmark_text.length - right_info.length
+        footer_content = "#{bookmark_text}#{' ' * padding}#{right_info}"
+        footer_content = footer_content.ljust(@screen_width)[0...@screen_width]
+        print "\e[7m#{footer_content}\e[0m"
+      end
     end
 
     def handle_input
@@ -656,11 +713,12 @@ module Rufio
         is_project_selected = (bookmark[:name] == selected_name)
         selection_mark = is_project_selected ? "✓ " : "  "
 
-        # ブックマーク名を表示
+        # ブックマーク名を表示（番号付き）
+        number = index + 1  # 1-based index
         name = bookmark[:name]
-        max_name_length = width - 4  # selection_mark分を除く
+        max_name_length = width - 8  # selection_mark(2) + number(1-2) + ". "(2) + padding
         display_name = name.length > max_name_length ? name[0...max_name_length - 3] + '...' : name
-        line_content = "#{selection_mark}#{display_name}".ljust(width)
+        line_content = "#{selection_mark}#{number}. #{display_name}".ljust(width)
 
         if index == current_index
           # カーソル位置は選択色でハイライト
@@ -864,6 +922,69 @@ module Rufio
       draw_screen
     end
 
+    # ヘルプダイアログを表示
+    def show_help_dialog
+      content_lines = [
+        '',
+        "rufio v#{VERSION}",
+        '',
+        'Key Bindings:',
+        '',
+        'j/k      - Move up/down',
+        'h/l      - Navigate back/enter',
+        'g/G      - Go to top/bottom',
+        'o        - Open file',
+        'f        - Filter files',
+        's        - Search with fzf',
+        'F        - Content search (rga)',
+        'a/A      - Create file/directory',
+        'm/c/x    - Move/Copy/Delete',
+        'b        - Add bookmark',
+        'z        - Zoxide navigation',
+        '0        - Go to start directory',
+        '1-9      - Go to bookmark',
+        'p        - Project mode',
+        ':        - Command mode',
+        'q        - Quit',
+        ''
+      ]
+
+      # お知らせ情報を追加
+      require_relative 'info_notice'
+      info_notice = InfoNotice.new
+      all_notices = Dir.glob(File.join(info_notice.info_dir, '*.txt'))
+
+      if !all_notices.empty?
+        content_lines << 'Recent Updates:'
+        content_lines << ''
+        all_notices.take(3).each do |file|
+          title = info_notice.extract_title(file)
+          content_lines << "  • #{title}"
+        end
+        content_lines << ''
+      end
+
+      content_lines << 'Press any key to continue...'
+
+      width = 60
+      height = [content_lines.length + 4, @screen_height - 4].min
+      x, y = @dialog_renderer.calculate_center(width, height)
+
+      @dialog_renderer.draw_floating_window(x, y, width, height, 'rufio - Help', content_lines, {
+        border_color: "\e[36m",    # Cyan
+        title_color: "\e[1;36m",   # Bold cyan
+        content_color: "\e[37m"    # White
+      })
+
+      require 'io/console'
+      IO.console.getch
+      @dialog_renderer.clear_area(x, y, width, height)
+
+      # 画面を再描画
+      refresh_display
+      draw_screen
+    end
+
     # プロジェクトモードでコマンドを実行
     def activate_project_command_mode(project_mode, project_command, project_log)
       return unless project_mode.selected_path

data/lib/rufio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufio
-  VERSION = '0.21.0'
+  VERSION = '0.30.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.30.0
 platform: ruby
 authors:
 - masisz
@@ -120,6 +120,7 @@ files:
 - CHANGELOG_v0.10.0.md
 - CHANGELOG_v0.20.0.md
 - CHANGELOG_v0.21.0.md
+- CHANGELOG_v0.30.0.md
 - CHANGELOG_v0.4.0.md
 - CHANGELOG_v0.5.0.md
 - CHANGELOG_v0.6.0.md
@@ -133,7 +134,9 @@ files:
 - config_example.rb
 - docs/PLUGIN_GUIDE.md
 - docs/plugin_example.rb
-- info/welcome.txt
+- info/help.md
+- info/keybindings.md
+- info/welcome.md
 - lib/rufio.rb
 - lib/rufio/application.rb
 - lib/rufio/bookmark.rb

data/info/welcome.txt

@@ -1,21 +0,0 @@
-# Welcome to rufio!
-
-Thank you for using rufio - a terminal-based file manager.
-
-Key Features:
-  - Vim-like keybindings (j/k/h/l for navigation)
-  - Real-time filtering (f key)
-  - Advanced search with fzf and rga
-  - Bookmark support (b key)
-  - Plugin system for extensibility
-
-Quick Start:
-  j/k       - Move up/down
-  h/l       - Parent dir / Enter dir
-  f         - Filter files
-  b         - Bookmarks
-  :         - Command mode
-  q         - Quit
-
-For more information, visit:
-  https://github.com/masisz/rufio