rufio 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247130c9fd76d05ed1ca70b859ea587e0b42f82ca7491fdc8b1ebea80d0257d4
-  data.tar.gz: 0122c547241cbd60c870798324b9cddaef6a3767a3153f52ca3b6b6cee3efa07
+  metadata.gz: c22a65655be19fc13d4e565ea8f926186fc58c7acbff0e16daed2a0efd3362b1
+  data.tar.gz: 654b40fe283c94abc1c438b77a2a8eeabc5e5a6321acd01e056d6ccaa5af874b
 SHA512:
-  metadata.gz: 6ef019b2c59bc7bea03293c837ca7ff1f40cb4015e585056c9d12628dd552e33533a6ab3e6d012473110ebac0456978d1bb5c762b6192f13d7d8a269fd0826a9
-  data.tar.gz: 75138dbdeb740c137045ef17ba6ede44a8a4b2aa85450618e457b3e8d04ca0d5d6157622aadccb9abb934e4c60b4c5a830923406d9854d02128c5f65e4c19e53
+  metadata.gz: afb532e1ae55826d8ffeb2607b31717bbae6a2c322493f9a5d81f308bad8c995c714e6638376fbba5ed3878689193917b29814e0ed657d02905a9d8ba8a873c5
+  data.tar.gz: 97e60e1b5e180eccaf10fb2c5e501f52ec51dde50fc32f0fa5c5f11c2cbf89b367f970c693f5e2d533efea928d1ccd3a8a9e9aed72c4a1830e0975fb9033a980

data/CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to rufio will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2026-10-25
+
+### Added
+- G mode shows a yellow animated `Searching...` indicator even while no matches arrive, and switches to `Search complete` when scanning finishes
+- Configure G mode file name and content search exclusions with `GLOBAL_SEARCH_EXCLUDED_EXTENSIONS` in `config.rb`, supporting case-insensitive and compound extensions
+- G mode content search: Use Tab to switch between file names and literal text search, with matching lines and line numbers, Japanese text support, and background cancellation when editing the query
+- C mode: Open `~/.config/rufio/` with the same navigation, preview, and file operations as Files mode; create the directory if needed
+- G mode: Search file names recursively across all bookmarked directories, with background scanning, incremental filtering, and Enter to locate a result in Files mode
+
+### Changed
+- Move the bottom-of-list shortcut from `G` to `}` to make room for global search
+
+## [1.0.4] - 2026-10-25
+
+### Changed
+- Replace directory-based Help with a floating menu containing Controls, Modes, and Scripts sections. Switch sections with 1/2/3 or Tab, scroll with j/k, and close with ESC while preserving the current mode, directory, and preview focus
+- Show mode shortcuts as `[L] Logs`, `[J] Jobs`, and `[?] Help` in the bottom bar
+
+### Fixed
+- Show `ESC: Back to files` below the file name in Preview mode
+- Preserve the original return directory when entering Logs repeatedly and prevent overlapping Help and Logs states
+- Keep mouse interactions inside the floating Help window from affecting the underlying file list
+
 ## [1.0.3] - 2026-10-23
 
 ### Security

data/README.md

@@ -2,34 +2,26 @@
 
 **Runtime Unified Flow I/O Operator**
 
-A TUI file manager that executes and coordinates tools and scripts from files.
-Supports Ruby/Python/PowerShell and integrates your development workflow in one place.
+A terminal file manager that keeps your everyday script workflow close at hand.
+Find files, run Ruby, Python, or PowerShell scripts in the current directory, and check jobs and logs.
+Add your own actions in Ruby.
 
 [日本語](./README_ja.md) | **English**
 
-## Concept
+## What Makes rufio Different
 
-rufio is not just a file manager. It's a **tool runtime execution environment**.
+rufio brings finding files, running scripts, and checking results together in one interface.
 
-```
-┌─────────────────────────────────────────────────────────┐
-│                        rufio                            │
-│         Runtime Unified Flow I/O Operator               │
-├─────────────────────────────────────────────────────────┤
-│  Files ──→ Scripts ──→ Tools ──→ Output                 │
-│    ↑                                   │                │
-│    └───────────── Feedback ────────────┘                │
-└─────────────────────────────────────────────────────────┘
-```
-
-- **File Operations**: Traditional file manager functionality
-- **Script Execution**: Run Ruby/Python/PowerShell scripts in file context
-- **Tool Integration**: Seamless integration with external tools (git, fzf, rga, etc.)
-- **Unified I/O**: Manage all input/output in a single flow
+- **Run scripts where your files are**: Register your script directories, then press `:`, type `@` + part of a script name, press `Tab`, and hit `Enter`. Run Ruby, Python, or PowerShell scripts in the directory you are browsing
+- **Follow jobs and execution logs**: Keep browsing while scripts run in the background. Press `J` to check jobs and `L` to view execution logs
+- **Add your own actions in Ruby**: Define custom commands with a small Ruby DSL in `~/.config/rufio/commands.rb`. `~/.rufio/commands.rb` is also supported
+- **Use installed tools without extra configuration**: Search file names with fzf, search contents with rga, highlight previews with bat, and navigate directory history with zoxide
+- **Windows support**: Run PowerShell scripts with keyboard input handling adapted to Windows terminals
+- **Trace behavior in the source**: The implementation is primarily Ruby, so you can inspect and change the parts you need. Security design is documented in [SECURITY.md](./SECURITY.md)
 
 ## Features
 
-### As a Tool Runtime
+### For Script Workflows
 
 - **Multi-language Script Support**: Ruby, Python, PowerShell
 - **Script Path Management**: Register and manage multiple script directories
@@ -92,7 +84,7 @@ rufio /path/to  # Launch in specified directory
 |-----|----------|
 | `j/k` | Move up/down |
 | `h/l` | Parent/child directory |
-| `g/G` | Top/bottom |
+| `g/}` | Top/bottom |
 | `Enter` | Enter directory/open file |
 | `q` | Quit |
 
@@ -131,11 +123,43 @@ rufio /path/to  # Launch in specified directory
 | Key | Function |
 |-----|----------|
 | `:` | Command mode |
+| `G` | Search file names or contents across all bookmarked directories |
+| `C` | Open ~/.config/rufio/ in Config mode (same controls as Files) |
 | `J` | Job mode |
 | `L` | View execution logs |
 | `?` | Help |
 | `Shift+Tab` | Switch mode (reverse) |
 
+### Global Search (G mode)
+
+Press `G` to search recursively across all bookmarked directories. `Tab`
+switches between **File names** and **Content**. Type a literal string to
+search (case insensitive); content results include the file, line number,
+and matching text. Text is read as UTF-8; files containing NUL bytes in the
+first 8 KB are skipped as binary. Use Up/Down or Ctrl+N/P to select a
+result, and press Enter to jump to that file in Files mode. `Ctrl+U` clears
+the query; `Esc` cancels and returns to your previous view. Scanning runs in
+the background and skips inaccessible directories and directory symlinks.
+Add bookmarks with `b` before searching. G mode needs no external search tools.
+While scanning, a yellow `Searching...` indicator animates even before matches
+arrive. It turns green and displays `Search complete` when the scan finishes.
+
+To exclude extensions from both file name and content searches, add this to
+`~/.config/rufio/config.rb` and restart Rufio:
+
+```ruby
+GLOBAL_SEARCH_EXCLUDED_EXTENSIONS = %w[.png .jpg .zip .tar.gz .log].freeze
+```
+
+Extensions are case insensitive and the leading dot is optional. The default
+is `[]` (no extension exclusions). Directory names are unaffected.
+
+### Config Mode (C)
+
+Press `C` to open `~/.config/rufio/`, creating it if needed. Navigation, previews,
+and file operations work as in Files mode. Browse settings and scripts directly;
+leaving the config directory returns the mode display to Files.
+
 ## Command Mode
 
 Press `:` to enter command mode and execute various commands.

data/README_ja.md

@@ -2,36 +2,26 @@
 
 **Runtime Unified Flow I/O Operator**
 
-ファイルを起点に、ツールとスクリプトを実行・連携させるTUIファイルマネージャー。
-Ruby/Python/PowerShellに対応し、開発ワークフローを一箇所に統合します。
-
-A TUI file manager as a unified runtime environment for tools and scripts.
+日々のスクリプト作業を手元にまとめるターミナルファイラ。
+ファイルを探し、その場所で Ruby・Python・PowerShell を実行し、ジョブとログを確認できます。
+自分用の操作は Ruby で追加できます。
 
 **日本語** | [English](./README.md)
 
-## コンセプト
-
-rufioは単なるファイルマネージャーではありません。**ツールランタイム実行環境**です。
+## rufioならではの点
 
-```
-┌─────────────────────────────────────────────────────────┐
-│                        rufio                            │
-│         Runtime Unified Flow I/O Operator               │
-├─────────────────────────────────────────────────────────┤
-│  Files ──→ Scripts ──→ Tools ──→ Output                 │
-│    ↑                                   │                │
-│    └───────────── Feedback ────────────┘                │
-└─────────────────────────────────────────────────────────┘
-```
+rufio は、ファイルを探すところからスクリプトの実行、結果の確認までを一つの画面にまとめます。
 
-- **ファイル操作**: 従来のファイルマネージャー機能
-- **スクリプト実行**: Ruby/Python/PowerShellスクリプトをファイルコンテキストで実行
-- **ツール連携**: 外部ツール（git, fzf, rga等）とのシームレスな統合
-- **統一I/O**: すべての入出力を単一のフローで管理
+- **ファイルのある場所からスクリプトを実行**: スクリプトのディレクトリを登録し、`:` → `@` + スクリプト名の一部 → `Tab` → `Enter` で呼び出せます。Ruby・Python・PowerShell を、いま開いているディレクトリで実行できます
+- **ジョブとログで実行結果を追える**: バックグラウンドで実行しながらファイル操作を続け、`J` でジョブ、`L` で実行ログを確認できます
+- **自分用の操作を Ruby で追加**: `~/.config/rufio/commands.rb` に小さな Ruby DSL で独自コマンドを定義できます。`~/.rufio/commands.rb` にも対応しています
+- **インストール済みのツールと追加設定なしで連携**: fzf でファイル名検索、rga で内容検索、bat でプレビューのシンタックスハイライト、zoxide でディレクトリ履歴から移動できます
+- **Windows にも対応**: PowerShell スクリプトの実行に対応し、Windows のターミナルに合わせたキー入力処理を備えています
+- **挙動をソースで追いやすい**: Ruby を中心とした実装で、必要な処理を自分で確認・修正できます。セキュリティに関する設計は [SECURITY.md](./SECURITY.md) にまとめています
 
 ## 特徴
 
-### ツールランタイムとして
+### スクリプト作業のために
 
 - **マルチ言語スクリプト対応**: Ruby, Python, PowerShell
 - **スクリプトパス管理**: 複数のスクリプトディレクトリを登録・管理
@@ -94,7 +84,7 @@ rufio /path/to  # 指定したディレクトリで起動
 |------|------|
 | `j/k` | 上下移動 |
 | `h/l` | 親/子ディレクトリ |
-| `g/G` | 先頭/末尾 |
+| `g/}` | 先頭/末尾 |
 | `Enter` | ディレクトリに入る/ファイルを開く |
 | `q` | 終了 |
 
@@ -136,8 +126,40 @@ rufio /path/to  # 指定したディレクトリで起動
 | `J` | ジョブモード |
 | `L` | 実行ログ表示 |
 | `?` | ヘルプ |
+| `G` | 全ブックマーク配下のファイル名・ファイル内容を横断検索 |
+| `C` | ~/.config/rufio/を開く（Configモード、操作はFilesと共通） |
 | `Shift+Tab` | モード切り替え（逆順） |
 
+### Gモード（横断検索）
+
+`G` を押すと、ブックマークした全ディレクトリの配下を再帰的に検索します。
+Tabで **File names（ファイル名）** と **Content（ファイル内容）** を切り替えます。
+大文字・小文字を区別しない文字列の部分一致で検索し、内容検索ではファイル名・行番号・一致した行を表示します。
+テキストはUTF-8として読み込み、先頭8 KBにNULバイトがあるファイルはバイナリとしてスキップします。
+上下矢印または `Ctrl+N/P` で選択、
+Enterで選んだファイルの場所へ移動します。`Ctrl+U` で検索語をクリアし、
+Escで元の表示に戻ります。検索はバックグラウンドで進みます。
+検索対象は `b` で登録したブックマークです。外部検索ツールは不要です。
+アクセスできないディレクトリはスキップし、ディレクトリのシンボリックリンクは辿りません。
+検索中は黄色の `Searching...` と動くスピナーを表示します。
+結果がまだ見つかっていない間も表示が動き、完了すると緑の `Search complete` に切り替わります。
+
+ファイル名検索・内容検索から特定の拡張子を除外するには、
+`~/.config/rufio/config.rb` に以下を追加してRufioを再起動します。
+
+```ruby
+GLOBAL_SEARCH_EXCLUDED_EXTENSIONS = %w[.png .jpg .zip .tar.gz .log].freeze
+```
+
+大文字・小文字は区別せず、先頭のドットは省略できます。デフォルトは `[]`（拡張子の除外なし）です。
+ディレクトリ名には適用しません。
+
+### Configモード（C）
+
+`C` で `~/.config/rufio/` を開きます。ディレクトリがなければ作成します。
+移動・プレビュー・ファイル操作はFilesモードと共通で、設定やスクリプトを直接編集できます。
+設定ディレクトリの外へ移動すると、モード表示がFilesに戻ります。
+
 ## コマンドモード
 
 `:` でコマンドモードを起動し、様々なコマンドを実行できます。

data/SECURITY.md

@@ -0,0 +1,95 @@
+# Security Policy / セキュリティポリシー
+
+[English](#english) | [日本語](#日本語)
+
+## English
+
+### Supported versions
+
+Only the latest released version receives security fixes. Please upgrade with `gem update rufio` before reporting.
+
+### Reporting a vulnerability
+
+Please **do not open a public issue** for security problems.
+
+- Use GitHub's private reporting: [Security → Report a vulnerability](https://github.com/masisz/rufio/security/advisories/new)
+- Or email masisz.1567@gmail.com
+
+Include the rufio version, OS, steps to reproduce, and the impact you expect. This is a personal project, so responses are best-effort, but reports are taken seriously and fixes are noted in [CHANGELOG.md](./CHANGELOG.md) under `Security`.
+
+### Threat model
+
+rufio is a local TUI tool run by you, on files you can already access.
+
+**In scope** (treated as vulnerabilities):
+- Names or contents of files, directories, archives, or tool output causing unintended command execution (e.g. shell metacharacters in file names)
+- Escape sequences in file contents or names that manipulate the terminal in harmful ways
+- Unsafe handling of paths that lets an operation affect files outside what the user selected
+- Secrets exposed through logs or temporary files
+
+**Out of scope** (by design):
+- Commands you type yourself in command mode (`:`, `!`) — they are executed as shell commands
+- Code in your own configuration: `~/.rufio/commands.rb` and `~/.config/rufio/commands.rb` are **evaluated as Ruby**. Keep them writable only by you
+- Scripts you register under script paths — they run with your privileges
+- Vulnerabilities in external tools (fzf, rga, bat, zoxide, editors)
+
+### Design practices
+
+- Files and scripts are launched in array form (`system(*argv)`), never through a shell string; paths beginning with `-` are prefixed with `./`
+- Search queries are passed to rga after `--`
+- YAML is loaded with `YAML.safe_load`
+- Command execution logs are written with `0600` permissions
+- Runtime dependencies are limited to `io-console`, `pastel`, `tty-cursor`, `tty-screen`
+- Gems are published from tagged commits via RubyGems Trusted Publishing (no long-lived API key); CI runs the test suite before publishing
+
+### Known limitations
+
+- Text previews only detect binary files (by control-character ratio); terminal escape sequences inside otherwise-textual files are not explicitly stripped. Avoid previewing untrusted files in a terminal you do not trust
+- The optional native extension under `lib_zig` is not shipped in the gem and has not been independently audited
+
+---
+
+## 日本語
+
+### サポート対象バージョン
+
+セキュリティ修正は最新のリリースにのみ行います。報告の前に `gem update rufio` で更新してください。
+
+### 脆弱性の報告
+
+セキュリティ上の問題は**公開Issueに書かない**でください。
+
+- GitHubの非公開報告: [Security → Report a vulnerability](https://github.com/masisz/rufio/security/advisories/new)
+- またはメール: masisz.1567@gmail.com
+
+rufioのバージョン、OS、再現手順、想定される影響を添えてください。個人プロジェクトのため対応はベストエフォートですが、報告は真剣に扱い、修正は [CHANGELOG.md](./CHANGELOG.md) の `Security` に記載します。
+
+### 脅威モデル
+
+rufioは、あなた自身がアクセスできるファイルに対して、ローカルで実行するTUIツールです。
+
+**対象（脆弱性として扱う）**:
+- ファイル名・ディレクトリ名・アーカイブ・ツール出力の内容によって、意図しないコマンドが実行されること（例: ファイル名中のシェルメタ文字）
+- ファイル内容や名前に含まれるエスケープシーケンスによる、有害なターミナル操作
+- パスの扱いの不備により、ユーザーが選択した範囲外のファイルに操作が及ぶこと
+- ログや一時ファイルを通じた機密情報の漏えい
+
+**対象外（設計上の仕様）**:
+- コマンドモード（`:`、`!`）で自分で入力したコマンド — シェルコマンドとして実行されます
+- 自分の設定ファイル内のコード — `~/.rufio/commands.rb` と `~/.config/rufio/commands.rb` は**Rubyとして評価**されます。書き込み権限は自分だけにしてください
+- スクリプトパスに登録したスクリプト — あなたの権限で実行されます
+- 外部ツール（fzf、rga、bat、zoxide、エディタ）自体の脆弱性
+
+### 設計上の方針
+
+- ファイルやスクリプトは配列形式（`system(*argv)`）で起動し、シェル文字列を介しません。`-` で始まるパスには `./` を付与します
+- rga には `--` を挟んで検索語を渡します
+- YAML は `YAML.safe_load` で読み込みます
+- コマンド実行ログは `0600` で保存します
+- 実行時依存gemは `io-console`、`pastel`、`tty-cursor`、`tty-screen` のみです
+- gemはタグ付きコミットからRubyGemsのTrusted Publishingで公開します（長期APIキーなし）。公開前にCIでテストを実行します
+
+### 既知の制約
+
+- テキストのプレビューはバイナリ判定（制御文字の比率）のみで、テキストとして扱われるファイル内のエスケープシーケンスは明示的に除去していません。信頼できないファイルを、信頼できないターミナルでプレビューするのは避けてください
+- `lib_zig` のネイティブ拡張（任意機能）はgemに同梱しておらず、第三者による監査も受けていません

data/examples/config.rb

@@ -40,6 +40,14 @@ KEYBINDS = {
   open_file: %w[o SPACE]
 }.freeze
 
+# ========================================
+# G Mode Search Exclusions
+# ========================================
+# Exclude these extensions from both file name and content searches.
+# Case insensitive; a leading dot is optional. Compound suffixes work too.
+# Example: %w[.png .jpg .zip .tar.gz .log]
+GLOBAL_SEARCH_EXCLUDED_EXTENSIONS = [].freeze
+
 # ========================================
 # Application Associations
 # ========================================

data/lib/rufio/config.rb

@@ -56,7 +56,7 @@ module Rufio
         'ui.operation_prompt' => 'Operation: ',
 
         # Help text
-        'help.full' => 'j/k:move h:back l:enter o:open g/G:top/bottom 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.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
@@ -126,7 +126,7 @@ module Rufio
         'ui.operation_prompt' => 'Operation: ',
 
         # Help text
-        'help.full' => 'j/k:move h:back l:enter o:open g/G:top/end 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.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

data/lib/rufio/config_loader.rb

@@ -47,7 +47,7 @@ module Rufio
           navigate_parent: 'h',
           navigate_enter:  'l',
           top:             'g',
-          bottom:          'G',
+          bottom:          '}',
           refresh:         'R',
           # ファイル操作
           open_file:       'o',
@@ -72,6 +72,8 @@ module Rufio
           start_dir:       '0',
           # モード・ツール
           job_mode:        'J',
+          global_search:   'G',
+          config_mode:     'C',
           help:            '?',
           log_viewer:      'L',
           command_mode:    ':',
@@ -100,6 +102,18 @@ module Rufio
         default_keybinds.merge(user_keybinds)
       end
 
+      def global_search_excluded_extensions
+        values = load_config[:global_search_excluded_extensions]
+        return [] unless values.is_a?(Array)
+
+        values.select { |value| value.is_a?(String) }.map do |value|
+          extension = value.strip.downcase
+          next if extension.empty? || extension == '.'
+
+          extension.start_with?('.') ? extension : ".#{extension}"
+        end.compact.uniq
+      end
+
       def language
         load_config[:language] || Config.current_language
       end
@@ -286,7 +300,8 @@ module Rufio
         config = {
           applications: safe_const_get(:APPLICATIONS, default_config[:applications]),
           colors: safe_const_get(:COLORS, default_config[:colors]),
-          keybinds: safe_const_get(:KEYBINDS, {})
+          keybinds: safe_const_get(:KEYBINDS, {}),
+          global_search_excluded_extensions: safe_const_get(:GLOBAL_SEARCH_EXCLUDED_EXTENSIONS, [])
         }
 
         if Object.const_defined?(:LANGUAGE)
@@ -335,6 +350,7 @@ module Rufio
             selected: { hsl: [50, 90, 70] },
             preview: { hsl: [180, 60, 65] }
           },
+          global_search_excluded_extensions: [],
           keybinds: {},    # ユーザーの上書きのみ格納（デフォルトはdefault_keybindsを参照）
           ui_options: {}   # ユーザーの上書きのみ格納（デフォルトはdefault_ui_optionsを参照）
         }

data/lib/rufio/global_search.rb

@@ -0,0 +1,261 @@
+# frozen_string_literal: true
+
+require 'thread'
+require_relative 'text_utils'
+require_relative 'config_loader'
+
+module Rufio
+  # ブックマーク配下のファイル名・テキスト内容をバックグラウンドで横断検索する。
+  class GlobalSearch
+    SPINNER_FRAMES = ['|', '/', '-', '\\'].freeze
+    SPINNER_INTERVAL = 0.12
+
+    attr_reader :query, :results, :errors, :selected_index, :search_type, :skipped_files
+
+    def initialize
+      @active = false
+      @scanning = false
+      @worker = nil
+    end
+
+    def active?
+      @active
+    end
+
+    def scanning?
+      @scanning
+    end
+
+    def open(bookmarks)
+      close
+      @active = true
+      @query = ''
+      @search_type = :filename
+      @excluded_extensions = ConfigLoader.global_search_excluded_extensions
+      @bookmark_count = bookmarks.length
+      @roots = bookmarks.map { |bookmark| [bookmark[:name].to_s, bookmark[:path].to_s] }
+      start_scan
+      true
+    end
+
+    def close
+      @active = false
+      @scanning = false
+      @worker&.kill
+      @worker&.join
+      @worker = nil
+    end
+
+    # 1フレーム当たりの処理量を制限し、検索中も入力を受け付ける。
+    def poll
+      return false unless active?
+
+      changed = false
+      256.times do
+        event = begin
+          @events.pop(true)
+        rescue ThreadError
+          break
+        end
+        changed = true
+        type, value = event
+        case type
+        when :entry
+          @entries << value
+          @results << value if @search_type == :content || matches_query?(value)
+        when :error then @errors << value
+        when :skipped then @skipped_files += 1
+        when :done then @scanning = false
+        end
+      end
+      if scanning?
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if now - @last_spinner_update >= SPINNER_INTERVAL
+          @spinner_index = (@spinner_index + 1) % SPINNER_FRAMES.length
+          @last_spinner_update = now
+          changed = true
+        end
+      end
+      changed
+    end
+
+    def handle_key(key)
+      case key
+      when "\e" then close
+      when "\t"
+        @search_type = @search_type == :filename ? :content : :filename
+        start_scan
+      when "\r", "\n" then return @results[@selected_index]
+      when :down then @selected_index = [@selected_index + 1, [@results.length - 1, 0].max].min
+      when :up then @selected_index = [@selected_index - 1, 0].max
+      when "\x0e" then handle_key(:down) # Ctrl+N
+      when "\x10" then handle_key(:up)   # Ctrl+P
+      when "\x15" then update_query('')  # Ctrl+U
+      when "\u007f", "\b" then update_query(@query[0...-1])
+      else
+        update_query(@query + key) if key.is_a?(String) && !key.empty? && key.each_codepoint.all? { |c| c >= 32 && c != 127 }
+      end
+      nil
+    end
+
+    def draw(screen)
+      screen.clear
+      width = screen.width
+      type = @search_type == :content ? 'Content' : 'File names'
+      write_line(screen, 0, "G mode - #{type} | Tab: Switch name/content search", width, "\e[1;36m")
+      write_line(screen, 1, "Search: #{@query}_", width)
+      state = if scanning?
+                "[#{SPINNER_FRAMES[@spinner_index]}] Searching..."
+              elsif @search_type == :content && @query.empty?
+                'Ready'
+              else
+                'Search complete'
+              end
+      color = scanning? ? "\e[1;33m" : "\e[32m"
+      write_line(screen, 2, "#{state} | #{@bookmark_count} bookmarks | #{@results.length} matches | #{@errors.length} errors | #{@skipped_files} skipped", width, color)
+      row_height = @search_type == :content ? 2 : 1
+      capacity = [screen.height - 6, 0].max / row_height
+      first = [@selected_index - capacity + 1, 0].max
+      @results.slice(first, capacity).to_a.each_with_index do |entry, index|
+        selected = first + index == @selected_index
+        text = "#{selected ? '>' : ' '} [#{entry[:bookmark]}] #{entry[:relative_path]}"
+        text += ":#{entry[:line_number]}" if entry[:line_number]
+        y = index * row_height + 3
+        write_line(screen, y, text, width, selected ? "\e[1;36m" : nil)
+        write_line(screen, y + 1, "    #{entry[:match_text]}", width) if entry[:line_number]
+      end
+      if @results.empty?
+        message = if @bookmark_count.zero?
+                    'No bookmarks. Add directories with b in Files mode.'
+                  elsif scanning?
+                    'Searching bookmarked directories...'
+                  elsif @search_type == :content && @query.empty?
+                    'Type a string to search inside text files.'
+                  elsif !@errors.empty? && @entries.empty?
+                    'No readable files in bookmarked directories.'
+                  else
+                    'No matching files. Edit your search to try again.'
+                  end
+        write_line(screen, 3, message, width)
+      end
+      write_line(screen, screen.height - 3, @results[@selected_index]&.[](:path) || @errors.first.to_s, width, "\e[90m")
+      write_line(screen, screen.height - 2, 'ESC: Back | Enter: Go to file | Up/Down: Select | Type: Search', width)
+    end
+
+    private
+
+    def start_scan
+      @worker&.kill
+      @worker&.join
+      @worker = nil
+      @entries = []
+      @results = []
+      @errors = []
+      @skipped_files = 0
+      @selected_index = 0
+      @events = SizedQueue.new(256)
+      @spinner_index = 0
+      @last_spinner_update = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      @scanning = !(@search_type == :content && @query.empty?)
+      return unless @scanning
+
+      roots, events, type, query = @roots, @events, @search_type, @query.downcase
+      @worker = Thread.new do
+        begin
+          scan_roots(roots, events, type, query)
+        rescue StandardError => e
+          events << [:error, e.message]
+        end
+        events << [:done, nil]
+      end
+    end
+
+    def update_query(query)
+      @query = query
+      @selected_index = 0
+      @search_type == :content ? start_scan : filter_results
+    end
+
+    def filter_results
+      query = @query.downcase
+      @results = @entries.select { |entry| entry[:relative_path].scrub.downcase.include?(query) }
+      @selected_index = [[@selected_index, @results.length - 1].min, 0].max
+    end
+
+    def matches_query?(entry)
+      entry[:relative_path].scrub.downcase.include?(@query.downcase)
+    end
+
+    def scan_roots(roots, events, type, query)
+      visited_dirs = {}
+      roots.each do |name, root|
+        begin
+          root = File.expand_path(root)
+          raise Errno::ENOTDIR, root unless File.directory?(root)
+
+          pending = [root]
+          until pending.empty?
+            directory = pending.pop
+            canonical = File.realpath(directory)
+            next if visited_dirs[canonical]
+
+            visited_dirs[canonical] = true
+            begin
+              Dir.each_child(directory) do |child|
+                path = File.join(directory, child)
+                # ディレクトリシンボリックリンクは追わず、循環・範囲外の走査を防ぐ。
+                if File.directory?(path)
+                  pending << path unless File.symlink?(path)
+                elsif File.file?(path)
+                  if child.scrub.downcase.end_with?(*@excluded_extensions)
+                    events << [:skipped, nil]
+                    next
+                  end
+
+                  entry = { path: path, bookmark: name, relative_path: path.delete_prefix(root + File::SEPARATOR) }
+                  if type == :content
+                    scan_content(entry, query, events)
+                  else
+                    events << [:entry, entry]
+                  end
+                end
+              end
+            rescue SystemCallError, IOError => e
+              events << [:error, "#{directory}: #{e.message}"]
+            end
+          end
+        rescue SystemCallError, IOError => e
+          events << [:error, "#{name}: #{e.message}"]
+        end
+      end
+    end
+
+    def scan_content(entry, query, events)
+      File.open(entry[:path], 'rb') do |file|
+        sample = file.read(8192).to_s
+        if sample.include?("\0")
+          events << [:skipped, nil]
+          return
+        end
+
+        file.rewind
+        file.each_line.with_index(1) do |raw_line, number|
+          line = raw_line.force_encoding(Encoding::UTF_8).scrub
+          match_index = line.downcase.index(query)
+          next unless match_index
+
+          snippet_start = [match_index - 30, 0].max
+          snippet = line[snippet_start, 200].strip
+          events << [:entry, entry.merge(line_number: number, match_text: snippet)]
+        end
+      end
+    rescue SystemCallError, IOError => e
+      events << [:error, "#{entry[:path]}: #{e.message}"]
+    end
+
+    def write_line(screen, y, text, width, color = nil)
+      safe_text = text.scrub.gsub(/[[:cntrl:]]/, ' ')
+      screen.put_string(0, y, TextUtils.truncate_to_width(safe_text, width), fg: color)
+    end
+  end
+end

data/lib/rufio/help_menu.rb

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require_relative 'text_utils'
+require_relative 'dialog_renderer'
+require_relative 'config_loader'
+
+module Rufio
+  # メインループを止めずに表示するヘルプメニュー。
+  class HelpMenu
+    SECTIONS = %w[Controls Modes Scripts].freeze
+    attr_reader :scroll_offset
+
+    def initialize
+      @active = false
+      @section_index = 0
+      @scroll_offset = 0
+      @max_scroll = 0
+    end
+
+    def open
+      @active = true
+      @section_index = 0
+      @scroll_offset = 0
+    end
+
+    def active?
+      @active
+    end
+
+    def section
+      SECTIONS[@section_index]
+    end
+
+    def handle_key(key)
+      case key
+      when "\e", 'q', '?' then @active = false
+      when '1', '2', '3' then select_section(key.to_i - 1)
+      when "\t", 'l' then select_section((@section_index + 1) % SECTIONS.length)
+      when 'h', "\e[Z" then select_section((@section_index - 1) % SECTIONS.length)
+      when 'j' then @scroll_offset = [@scroll_offset + 1, @max_scroll].min
+      when 'k' then @scroll_offset = [@scroll_offset - 1, 0].max
+      when "\x04" then @scroll_offset = [@scroll_offset + @page_size.to_i, @max_scroll].min
+      when "\x15" then @scroll_offset = [@scroll_offset - @page_size.to_i, 0].max
+      when 'g' then @scroll_offset = 0
+      when 'G' then @scroll_offset = @max_scroll
+      end
+      true
+    end
+
+    def content
+      case section
+      when 'Controls'
+        [
+          'Navigation',
+          "#{key(:move_down)}/#{key(:move_up)} or arrows: Move down/up",
+          "#{key(:navigate_parent)}/#{key(:navigate_enter)}: Parent / enter directory",
+          'Enter: Open file preview | ESC: Back to file list',
+          'Preview: j/k scroll, Ctrl+D/U page down/up',
+          "#{key(:top)}/#{key(:bottom)}: First / last entry",
+          "#{key(:open_file)}: Open in external editor",
+          "#{key(:refresh)}: Refresh directory",
+          '', 'Selection and file operations',
+          "#{key(:select)}: Select / unselect file",
+          "#{key(:copy_selected)}/#{key(:move_selected)}/#{key(:delete_selected)}: Copy / move / delete selected files",
+          "#{key(:rename)}/#{key(:delete)}: Rename / delete current file",
+          "#{key(:create_file)}/#{key(:create_dir)}: Create file / directory",
+          '', 'Search and bookmarks',
+          "#{key(:filter)}: Filter | Enter: Apply | ESC: Clear",
+          "#{key(:fzf_search)}: Filename search (fzf)",
+          "#{key(:rga_search)}: Content search (rga)",
+          "#{key(:global_search)}: Search file names or contents across all bookmarks",
+          "#{key(:add_bookmark)}/#{key(:bookmark_menu)}: Add / manage bookmarks",
+          'Tab / Shift+Tab: Next / previous bookmark',
+          "1-9: Jump to bookmark | #{key(:start_dir)}: Start directory",
+          "#{key(:zoxide)}: Directory history (zoxide)",
+          "#{key(:quit)}: Quit (with confirmation)"
+        ]
+      when 'Modes'
+        [
+          'Files', 'Browse directories, select files and view previews.',
+          '', "[#{key(:config_mode)}] Config",
+          'Open ~/.config/rufio/ to edit settings and scripts.',
+          'The config directory is created if it does not exist.',
+          'Navigation, previews and file operations work as in Files.',
+          "#{key(:navigate_parent)}: Parent directory; leaving config returns to Files.",
+          '', "[#{key(:global_search)}] Global search",
+          'Search file names or text inside every bookmarked directory.',
+          'Tab: Switch File names / Content (literal, case insensitive)',
+          'Content results show file, line number and matching text.',
+          'Yellow Searching... + spinner: Search is running.',
+          'Green Search complete: All bookmarked directories scanned.',
+          'Exclude extensions in ~/.config/rufio/config.rb:',
+          'GLOBAL_SEARCH_EXCLUDED_EXTENSIONS = %w[.zip .log]',
+          'Applies to names and contents. Restart Rufio after editing.',
+          'Extensions ignore case; leading dots are optional; [] excludes none.',
+          'Type to filter | Up/Down or Ctrl+N/P: Select',
+          'Enter: Go to the selected file in Files mode',
+          'ESC: Return to the previous mode | Ctrl+U: Clear query',
+          '', "[#{key(:log_viewer)}] Logs",
+          'Browse command logs. Enter opens a preview.',
+          'ESC: Leave preview; ESC again: Return to Files.',
+          '', "[#{key(:job_mode)}] Jobs",
+          'View background commands and their status.',
+          'Space: View log | x: Cancel job | ESC: Back',
+          '', "[#{key(:help)}] Help",
+          'This floating menu keeps your current mode and directory.',
+          '1/2/3 or Tab: Select section | ESC: Close',
+          '', "[#{key(:command_mode)}] Command",
+          'Type a command, then Enter to run it.',
+          'Tab: Complete | Up/Down: History | ESC: Cancel',
+          ':!git status: Run a shell command',
+          ':@hello.rb: Run a script in the current directory'
+        ]
+      when 'Scripts'
+        [
+          '1. Personal scripts',
+          'Place scripts in ~/.config/rufio/scripts/',
+          'Example: ~/.config/rufio/scripts/hello.rb',
+          'Press : and type hello, then Enter (:hello).',
+          '', '2. Additional script folders',
+          'List folders in ~/.config/rufio/script_paths.yml:',
+          '- ~/.config/rufio/scripts', '- ~/my-scripts',
+          'Folders are searched in order. First matching name wins.',
+          '', '3. Project scripts',
+          'Place hello.rb or hello.sh in the directory you browse.',
+          'Run it with :@hello.rb or :@hello.sh.',
+          'Project search paths: ./rufio.yml, script_paths list.',
+          '', '4. Run and monitor',
+          'Tab completes script names. Up/Down recalls commands.',
+          "#{key(:job_mode)}: Background jobs | #{key(:log_viewer)}: Execution logs",
+          'Supported: Ruby, shell, Python and other script types.'
+        ]
+      end
+    end
+
+    def draw(screen)
+      width = [screen.width, 78].min
+      height = [screen.height, 26].min
+      return if width < 8 || height < 8
+
+      @page_size = height - 7
+      lines = content.flat_map { |line| line.empty? ? [''] : TextUtils.wrap_preview_lines([line], width - 4) }
+      @max_scroll = [lines.length - @page_size, 0].max
+      @scroll_offset = [@scroll_offset, @max_scroll].min
+      tabs = SECTIONS.each_with_index.map do |name, index|
+        index == @section_index ? "[#{index + 1}:#{name}]" : " #{index + 1}:#{name} "
+      end.join(' ')
+      visible = [TextUtils.truncate_to_width(tabs, width - 2), '']
+      visible.concat(lines.slice(@scroll_offset, @page_size) || [])
+      visible << '' while visible.length < height - 5
+      visible << TextUtils.truncate_to_width('ESC: Close | Tab: Menu | j/k: Scroll', width - 2)
+      screen.enable_overlay
+      screen.clear_overlay
+      title = "Help - #{section} (#{@scroll_offset + 1}/#{@max_scroll + 1})"
+      DialogRenderer.new.draw_floating_window_to_overlay(
+        screen, (screen.width - width) / 2, (screen.height - height) / 2,
+        width, height, TextUtils.truncate_to_width(title, width - 2), visible,
+        border_color: "\e[36m", title_color: "\e[1;36m"
+      )
+    end
+
+    private
+
+    def select_section(index)
+      @section_index = index
+      @scroll_offset = 0
+    end
+
+    def key(action)
+      value = ConfigLoader.keybinds[action]
+      value == ' ' ? 'Space' : value.to_s
+    end
+  end
+end

data/lib/rufio/keybind_handler.rb

@@ -25,6 +25,40 @@ module Rufio
       @nav_controller.preview_focused?
     end
 
+    def global_search_mode?
+      @terminal_ui&.global_search_active? || false
+    end
+
+    def start_global_search
+      @terminal_ui&.start_global_search(@bookmark_manager.list)
+    end
+
+    def config_directory
+      Config::CONFIG_DIR
+    end
+
+    def config_mode?
+      return false if @in_log_viewer_mode || @in_help_mode || @job_mode.active?
+
+      path = @directory_listing&.current_path
+      root = File.expand_path(config_directory)
+      path && (path == root || path.start_with?(root + File::SEPARATOR))
+    end
+
+    def enter_config_mode
+      return false unless @directory_listing
+
+      FileUtils.mkdir_p(config_directory)
+      exit_log_viewer_mode if @in_log_viewer_mode
+      exit_help_mode if @in_help_mode
+      exit_job_mode if @job_mode.active?
+      @nav_controller.unfocus_preview_pane
+      navigate_to_directory(config_directory)
+    rescue SystemCallError => e
+      @notification_manager.add("Cannot open config directory: #{e.message}", :error, duration: 0)
+      false
+    end
+
     def preview_scroll_offset
       @nav_controller.preview_scroll_offset
     end
@@ -130,6 +164,18 @@ module Rufio
     def handle_key(key)
       return false unless @directory_listing
 
+      if @key_map[key] == :help && !@filter_manager.filter_mode
+        return show_help_dialog
+      end
+
+      if @key_map[key] == :global_search && !@filter_manager.filter_mode
+        return start_global_search
+      end
+
+      if @key_map[key] == :config_mode && !@filter_manager.filter_mode
+        return enter_config_mode
+      end
+
       # ジョブモード中の特別処理
       if @job_mode.active?
         return handle_job_mode_key(key)
@@ -217,6 +263,9 @@ module Rufio
     # ヘルプモードに入る
     def enter_help_mode
       return false unless @directory_listing
+      return true if @in_help_mode
+
+      exit_log_viewer_mode if @in_log_viewer_mode
 
       # 現在のディレクトリを保存
       @pre_help_directory = @directory_listing.current_path
@@ -264,6 +313,9 @@ module Rufio
     # ログビューワモードに入る
     def enter_log_viewer_mode
       return false unless @directory_listing
+      return true if @in_log_viewer_mode
+
+      exit_help_mode if @in_help_mode
 
       # 現在のディレクトリを保存
       @pre_log_viewer_directory = @directory_listing.current_path
@@ -488,7 +540,7 @@ module Rufio
       when :zoxide          then show_zoxide_menu
       when :start_dir       then goto_start_directory
       when :job_mode        then enter_job_mode
-      when :help            then enter_help_mode
+      when :help            then show_help_dialog
       when :log_viewer      then enter_log_viewer_mode
       when :command_mode    then activate_command_mode
       when :quit            then exit_request

data/lib/rufio/tab_mode_manager.rb

@@ -4,10 +4,12 @@ module Rufio
   # タブモード管理クラス
   # 上部メニューの2段目に表示するモードタブを管理する
   class TabModeManager
-    MODES = %i[files logs jobs help].freeze
+    MODES = %i[files config global logs jobs help].freeze
 
     MODE_LABELS = {
       files: 'Files',
+      config: 'Config',
+      global: 'Search',
       logs: 'Logs',
       jobs: 'Jobs',
       help: 'Help'
@@ -15,6 +17,8 @@ module Rufio
 
     MODE_KEYS = {
       files: nil,
+      config: 'C',
+      global: 'G',
       logs: 'L',
       jobs: 'J',
       help: '?'

data/lib/rufio/terminal_ui.rb

@@ -2,6 +2,8 @@
 
 require 'io/console'
 require_relative 'text_utils'
+require_relative 'help_menu'
+require_relative 'global_search'
 
 module Rufio
   class TerminalUI
@@ -51,6 +53,8 @@ module Rufio
       @input_queue = nil
       @input_thread = nil
       @command_mode_active = false
+      @help_menu = HelpMenu.new
+      @global_search = GlobalSearch.new
       @command_input = ""
       @command_mode = CommandMode.new
       @dialog_renderer = DialogRenderer.new
@@ -302,6 +306,7 @@ module Rufio
     end
 
     def cleanup_terminal
+      @global_search.close
       # マウスレポートを先に無効化して新しいイベントの流入を止める
       if windows?
         print "\e[?1000l\e[?1006l"
@@ -473,6 +478,8 @@ module Rufio
           needs_redraw = true
         end
 
+        needs_redraw = true if @global_search.poll
+
         # 非同期シンタックスハイライト完了チェック（UIRenderer側のフラグを参照）
         if @ui_renderer.highlight_updated?
           @ui_renderer.reset_highlight_updated
@@ -494,8 +501,10 @@ module Rufio
             draw_screen_to_buffer(@screen, nil, current_fps)
           end
 
-          # コマンドモードがアクティブな場合はオーバーレイにダイアログを描画
-          if @command_mode_active
+          # ヘルプまたはコマンドモードのダイアログをオーバーレイに描画
+          if help_dialog_active?
+            @help_menu.draw(@screen)
+          elsif @command_mode_active
             # 前回のオーバーレイ残留を防ぐためクリアしてから描画
             @screen.clear_overlay if @screen.overlay_enabled?
             draw_command_mode_to_overlay
@@ -525,6 +534,12 @@ module Rufio
 
     # UIRenderer に全描画処理を委譲
     def draw_screen_to_buffer(screen, notification_message = nil, fps = nil)
+      if global_search_active?
+        @global_search.draw(screen)
+        @ui_renderer.draw_mode_tabs_to_buffer(screen, @screen_height - 1)
+        return
+      end
+
       @ui_renderer.draw_screen_to_buffer(
         screen, notification_message, fps,
         in_job_mode: @in_job_mode,
@@ -594,11 +609,17 @@ module Rufio
             return true
           end
           input = case third_char
-          when 'A' then 'k'  # Up arrow
-          when 'B' then 'j'  # Down arrow
-          when 'C' then 'l'  # Right arrow
-          when 'D' then 'h'  # Left arrow
-          when 'Z' then handle_shift_tab; return true  # Shift+Tab
+          when 'A' then global_search_active? && !help_dialog_active? ? :up : 'k'  # Up arrow
+          when 'B' then global_search_active? && !help_dialog_active? ? :down : 'j'  # Down arrow
+          when 'C' then global_search_active? && !help_dialog_active? ? :right : 'l'  # Right arrow
+          when 'D' then global_search_active? && !help_dialog_active? ? :left : 'h'  # Left arrow
+          when 'Z'
+            if help_dialog_active?
+              handle_help_input("\e[Z")
+            elsif !global_search_active?
+              handle_shift_tab
+            end
+            return true  # Shift+Tab
           else
             # 未知の CSI シーケンス（\e[27;1u 等）: 残りバイトを読み捨てて
             # パイプを汚染しないようにする
@@ -610,14 +631,17 @@ module Rufio
         end
       end
 
+      return handle_help_input(input) if help_dialog_active?
+      return handle_global_search_input(input) if global_search_active?
+
       # TabキーはFilesモードの時のみブックマーク循環移動（ジョブモード中は無効）
-      if input == "\t" && @tab_mode_manager.current_mode == :files && !@in_job_mode
+      if input == "\t" && (@tab_mode_manager.current_mode == :files || @keybind_handler.config_mode?) && !@in_job_mode
         handle_tab_key
         return true
       end
 
       # 数字キー（1-9）: Filesモード かつ フィルターモード外でブックマークジャンプ＋ハイライト
-      if input&.match?(/^[1-9]$/) && @tab_mode_manager.current_mode == :files && !@keybind_handler.filter_active?
+      if input&.match?(/^[1-9]$/) && (@tab_mode_manager.current_mode == :files || @keybind_handler.config_mode?) && !@keybind_handler.filter_active?
         handle_bookmark_key(input.to_i)
         return true
       end
@@ -670,7 +694,7 @@ module Rufio
 
     # Shift+Tab: Filesモードでは前のブックマークへ循環移動、それ以外はモード逆順切り替え
     def handle_shift_tab
-      if @tab_mode_manager.current_mode == :files
+      if @tab_mode_manager.current_mode == :files || @keybind_handler.config_mode?
         prev_idx = @keybind_handler.goto_prev_bookmark
         if prev_idx
           @ui_renderer.set_highlighted_bookmark(prev_idx + 1)
@@ -692,6 +716,18 @@ module Rufio
     # @param row [Integer]  クリック行（1-indexed）
     # @param press [Boolean] true=押下, false=解放
     def handle_mouse_event(btn, col, row, press)
+      if help_dialog_active?
+        handle_help_input('k') if btn == 64
+        handle_help_input('j') if btn == 65
+        return
+      end
+
+      if global_search_active?
+        handle_global_search_input(:up) if btn == 64
+        handle_global_search_input(:down) if btn == 65
+        return
+      end
+
       case btn
       when 0  # 左クリック（押下のみ処理）
         handle_mouse_left_click(col, row) if press
@@ -774,6 +810,10 @@ module Rufio
     # モード変更を適用
     def apply_mode_change(mode)
       case mode
+      when :config
+        @keybind_handler.enter_config_mode
+      when :global
+        @keybind_handler.start_global_search
       when :files
         # ヘルプモードまたはログビューワモードから戻る
         if @keybind_handler.help_mode?
@@ -784,12 +824,7 @@ module Rufio
           @keybind_handler.send(:exit_job_mode)
         end
       when :help
-        # ヘルプモードに入る
-        unless @keybind_handler.help_mode?
-          @keybind_handler.send(:exit_log_viewer_mode) if @keybind_handler.log_viewer_mode?
-          @keybind_handler.send(:exit_job_mode) if @keybind_handler.in_job_mode?
-          @keybind_handler.send(:enter_help_mode)
-        end
+        show_help_dialog
       when :logs
         # ログビューワモードに入る
         unless @keybind_handler.log_viewer_mode?
@@ -1191,61 +1226,59 @@ module Rufio
     # Screen と Renderer のアクセサ（他のクラスから利用可能に）
     attr_reader :screen, :renderer
 
-    # ヘルプダイアログを表示
-    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',
-        'J        - Job mode',
-        ':        - Command mode',
-        'q        - Quit',
-        ''
-      ]
+    def start_global_search(bookmarks)
+      @global_search.open(bookmarks)
+    end
 
-      # お知らせ情報を追加
-      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}"
+    def global_search_active?
+      @global_search.active?
+    end
+
+    def handle_global_search_input(input)
+      if input == ConfigLoader.keybinds[:help]
+        show_help_dialog
+        return true
+      end
+      result = @global_search.handle_key(input)
+      if result.is_a?(Hash) && File.file?(result[:path])
+        @keybind_handler.exit_log_viewer_mode if @keybind_handler.log_viewer_mode?
+        @keybind_handler.exit_help_mode if @keybind_handler.help_mode?
+        @keybind_handler.exit_job_mode if @keybind_handler.in_job_mode?
+        if @keybind_handler.send(:navigate_to_directory, File.dirname(result[:path]))
+          index = @keybind_handler.get_active_entries.index { |entry| entry[:path] == result[:path] }
+          @keybind_handler.select_index(index) if index
+          @keybind_handler.unfocus_preview_pane
+          @global_search.close
         end
-        content_lines << ''
       end
+      unless global_search_active?
+        mode = if @keybind_handler.in_job_mode?
+                 :jobs
+               elsif @keybind_handler.log_viewer_mode?
+                 :logs
+               elsif @keybind_handler.config_mode?
+                 :config
+               else
+                 :files
+               end
+        @tab_mode_manager.switch_to(mode)
+      end
+      true
+    end
 
-      content_lines << 'Press any key to continue...'
+    # ヘルプは非同期オーバーレイとして表示し、元のモードを保持する。
+    def show_help_dialog
+      @help_menu.open
+      true
+    end
 
-      width = 60
-      height = [content_lines.length + 4, @screen_height - 4].min
+    def help_dialog_active?
+      @help_menu.active?
+    end
 
-      # オーバーレイダイアログを表示
-      show_overlay_dialog('rufio - Help', content_lines, {
-        width: width,
-        height: height,
-        border_color: "\e[36m",    # Cyan
-        title_color: "\e[1;36m",   # Bold cyan
-        content_color: "\e[37m"    # White
-      })
+    def handle_help_input(input)
+      @help_menu.handle_key(input)
+      true
     end
 
     # 未知の CSI シーケンス（\e[X...）の残りバイトを終端アルファベットまで読み捨てる。

data/lib/rufio/ui_renderer.rb

@@ -401,6 +401,10 @@ module Rufio
           header += ' ' * remaining_space if remaining_space > 0
           screen.put_string(content_x, line_num, header)
 
+        elsif i == 1 && @keybind_handler&.preview_focused?
+          hint = TextUtils.truncate_to_width(' ESC: Back to files', safe_width)
+          screen.put_string(content_x, line_num, hint + ' ' * (safe_width - TextUtils.display_width(hint)))
+
         elsif i >= 2 && highlighted_wrapped_lines
           # シンタックスハイライト付きコンテンツ
           scroll_offset = @keybind_handler&.preview_scroll_offset || 0
@@ -583,7 +587,7 @@ module Rufio
 
       modes.each_with_index do |mode, index|
         key = keys[mode]
-        label = key ? " #{key}:#{labels[mode]} " : " #{labels[mode]} "
+        label = key ? " [#{key}] #{labels[mode]} " : " #{labels[mode]} "
 
         if mode == current_mode
           label.each_char do |char|
@@ -778,12 +782,16 @@ module Rufio
     def sync_tab_mode_with_keybind_handler
       return unless @keybind_handler
 
-      current_mode = if @keybind_handler.in_job_mode?
+      current_mode = if @keybind_handler.global_search_mode?
+                       :global
+                     elsif @keybind_handler.in_job_mode?
                        :jobs
                      elsif @keybind_handler.help_mode?
                        :help
                      elsif @keybind_handler.log_viewer_mode?
                        :logs
+                     elsif @keybind_handler.config_mode?
+                       :config
                      else
                        :files
                      end

data/lib/rufio/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - masisz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-23 00:00:00.000000000 Z
+date: 2026-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -121,6 +121,7 @@ files:
 - README.md
 - README_ja.md
 - Rakefile
+- SECURITY.md
 - bin/rufio
 - docs/CHANGELOG_v0.10.0.md
 - docs/CHANGELOG_v0.20.0.md
@@ -174,7 +175,9 @@ files:
 - lib/rufio/file_operations.rb
 - lib/rufio/file_preview.rb
 - lib/rufio/filter_manager.rb
+- lib/rufio/global_search.rb
 - lib/rufio/health_checker.rb
+- lib/rufio/help_menu.rb
 - lib/rufio/info_notice.rb
 - lib/rufio/interpreter_resolver.rb
 - lib/rufio/job_manager.rb