ollama_chat 0.0.81 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb8acfbab42d7afd6b6bf67dfe087cfb3c12a61719834713c9cd2f095dd7ce8
-  data.tar.gz: efdba3f26df1ae84df62f2aa2a2f48e914baf2a5dd1430691e55be9f01a23774
+  metadata.gz: 8947d6cdb437ce85afb32cb689bad1b16de54c2afb35da9f0eac7b1f1fff19df
+  data.tar.gz: 3a03448c69d3f8883e11d5de11e9f44c455a4a8e95e2d93593d945dc99a0be63
 SHA512:
-  metadata.gz: b5042b32617e390e4cad869c2356dc0a12c5a8cc55a57c6f3d6f84fa20f2342a91afcddeb24898947b9a3d73d083b3b4ce666b13cab1e339a37ba76ecb3ec961
-  data.tar.gz: c3ada9646a5580fe07c463c62348e972a50f69cc563ae240b0000e18db917af160adc9e3234e4bbdbfda68907421f3445e18c61db1b25ccba393f670652938b9
+  metadata.gz: 02e28130adb2881c44ea053035b5b39eb43025bf0e761063e6442a031b8b8acd88fe588850438ff0ae3c9fcf039ca4cff32bcb5abae4bcca4a349852a217580b
+  data.tar.gz: 1055061e111fff2384020505b467b60ab30facc7fbf5733856061adc6834401a5414ba28a6716452b5b5fe2bb8ec5a77d54fc81d2e3ed065f0b9568847ce326c

data/CHANGES.md

@@ -1,34 +1,65 @@
 # Changes
 
+## 2026-03-24 v0.0.83
+
+- Added timeout support to `Dialog#confirm?`: introduced optional `timeout:`
+  and `default:` parameters, injected `IO.select` logic to respect the supplied
+  timeout and return the `default` when timed out, and updated YARD comments to
+  document the new parameters and return behavior.
+- Normalized namespaced tool calls in `OllamaChat`: updated
+  `lib/ollama_chat/follow_chat.rb` to extract the basename from `name` when it
+  contains a slash, added a warning log `@chat.log(:warn, msg)` to inform users
+  when a namespaced tool call is corrected, and adjusted the `name` variable so
+  that `@chat.tool_configured?(name)` and subsequent logic use the corrected
+  tool name.
+- Updated `OllamaChat::Dialog#choose_collection` to convert
+  `@documents.collections` to an array before concatenation, ensuring
+  consistent behavior when collections are not already arrays (e.g., NULL
+  objects).
+
+## 2026-03-21 v0.0.82
+
+- Add a `before` block setting `OC::OLLAMA::CHAT::TOOLS::CTAGS_TOOL` to `ctags`
+  in the `resolve_tag` spec.  
+- Updated `OllamaChat::Tools::PasteIntoEditor` description to use `text`
+  instead of `string` and clarified that no file or line is required when
+  pasting into the editor.  
+- Added bell and question mark emojis to various `confirm?` and `ask?` prompts
+  across multiple modules for clearer UX.  
+- Updated prompt string to `⏎  Press …` for better display.  
+- Enhanced `OllamaChat::Tools::ResolveTag` and `OllamaChat::Utils::TagResolver`
+  with a new `kinds` method, updated `kind` parameter description, refactored
+  `kind_of`, and fixed tag‑parsing regex to capture all columns.
+
 ## 2026-03-20 v0.0.81
 
 - Added `http_handling.rb` and `path_completer.rb` to gemspec
   `s.extra_rdoc_files`, `s.files`, and `s.test_files` lists, ensuring these
-  modules are documented and packaged.  
-- Updated `http_options` to build SSL and proxy settings.  
-- Completed `get_url` to merge headers, pass cache, debug, and reraise flags.  
-- Updated YARD comments with parameter and return details.  
-- Fixed `config.request_headers` usage and added `merge`.  
-- Declared `proxy` variable in options hash.  
-- Added `debug` flag from `config` to fetcher call.  
+  modules are documented and packaged.
+- Updated `http_options` to build SSL and proxy settings.
+- Completed `get_url` to merge headers, pass cache, debug, and reraise flags.
+- Updated YARD comments with parameter and return details.
+- Fixed `config.request_headers` usage and added `merge`.
+- Declared `proxy` variable in options hash.
+- Added `debug` flag from `config` to fetcher call.
 - Added `PathCompleter` utility in `lib/ollama_chat/utils/path_completer.rb`
-  that expands `./` and `~/` paths using `Dir.glob` and `File.expand_path`.  
-- Updated `lib/ollama_chat/utils.rb` to require the new helper.  
+  that expands `./` and `~/` paths using `Dir.glob` and `File.expand_path`.
+- Updated `lib/ollama_chat/utils.rb` to require the new helper.
 - Replaced inline path completion logic in `lib/ollama_chat/chat.rb` with
-  `OllamaChat::Utils::PathCompleter.new(pre, input).complete`.  
+  `OllamaChat::Utils::PathCompleter.new(pre, input).complete`.
 - Added tests for `PathCompleter` in
   `spec/ollama_chat/utils/path_completer_spec.rb`, stubbing `expand_path` for
-  home‑directory case.  
+  home‑directory case.
 - Added duration metric to tool call results: recorded `start = Time.now`
   before each tool call, stored `tools_used[name]` as a hash with `size` and
   `duration` keys, calculated `duration` with `Time.now - start` and formatted
   as `Tins::Duration.new(...).to_s`, kept size formatting using
-  `Tins::Unit.format(..., unit: ?B, prefix: 1024, format: '%.1f %U')`.  
+  `Tins::Unit.format(..., unit: ?B, prefix: 1024, format: '%.1f %U')`.
 - Added `./` file path completion to Reline: updated
   `OllamaChat::Chat#enable_command_completion` to add `./` path completion,
   replaced old `RELINE` completion proc with a new `case before` block that
   checks for `^/` and `./` patterns, ensuring file path completions are only
-  offered when the user starts with `./`.  
+  offered when the user starts with `./`.
 - Added user name to runtime info and prompts: added `OC::USER` config variable
   with default from `ENV['USER']`, included `user` in the hash returned by
   `runtime_information_values`, extended default prompts in
@@ -40,166 +71,166 @@
 
 ### Output & Paging
 
-- Remove the automatic `info` call from the main flow  
-- Wrap all output handling inside a `use_pager do |output|` block  
+- Remove the automatic `info` call from the main flow
+- Wrap all output handling inside a `use_pager do |output|` block
 - Pass the `output:` keyword to sub‑methods (`collection_stats`,
-  `Switches.show`, etc.)  
-- Adjust `Pager` to use a local `buffer` variable and `output.puts buffer`  
+  `Switches.show`, etc.)
+- Adjust `Pager` to use a local `buffer` variable and `output.puts buffer`
 - Update `StateSelectors.show` and `Switches.show` to accept `output: STDOUT`
-  and use `output.puts`  
+  and use `output.puts`
 - Modify `Switches.set` to accept `output: STDOUT` and call
   `self.show(output:)`
 
 ### Collection & Runtime Info
 
 - Change `collection_stats` signature to `output: STDOUT` and replace
-  `STDOUT.puts` with `output.puts`  
-- Show runtime‑information only when `runtime_info.on? && content` is true  
+  `STDOUT.puts` with `output.puts`
+- Show runtime‑information only when `runtime_info.on? && content` is true
 - Append a JSON line for runtime‑info instead of a plain‑text list
 
 ### Tool Call Handling
 
-- Initialize `tools_used` hash in `OllamaChat::FollowChat#handle_tool_calls`  
-- Store the formatted size of each tool result using `Tins::Unit.format`  
+- Initialize `tools_used` hash in `OllamaChat::FollowChat#handle_tool_calls`
+- Store the formatted size of each tool result using `Tins::Unit.format`
 - Replace the non‑existent `full?` check with `size ==
-  response.message.tool_calls.size`  
+  response.message.tool_calls.size`
 - Show a summary of tool call results and pause for user confirmation
 
 ### Confirmation Prompt
 
 - Add `confirm?` method to `OllamaChat::Dialog` for single‑character
-  confirmation prompts  
+  confirmation prompts
 - Replace all `ask?` calls with `confirm?`
 
 ### Command DSL
 
-- Add a `command` DSL in `command_concern.rb` for registering chat commands  
+- Add a `command` DSL in `command_concern.rb` for registering chat commands
 - Include `OllamaChat::CommandConcern` in `chat.rb` and drop the old
-  `handle_input` logic  
+  `handle_input` logic
 - Replace hard‑coded command handling with the new DSL (e.g., `/toggle`,
   `/input`, `/revise`, etc.)
 
 ### Documentation & README
 
 - Update `README.md` to show the new `/toggle` syntax and expanded command
-  table  
+  table
 - Update `bin/ollama_chat_send` help text to reflect the renamed `/input`
   command
 
 ### Utility Helpers
 
-- Add `go_command` helper in `dialog.rb` for parsing command‑line options  
+- Add `go_command` helper in `dialog.rb` for parsing command‑line options
 - Add `file_set_each`, `all_file_set`, and `provide_file_set_content` to
-  `input_content.rb`  
-- Update `context_spook` to use `file_set_each` and accept an `all` flag  
-- Add `strip_internal_json_markers` helper in `chat.rb`  
+  `input_content.rb`
+- Update `context_spook` to use `file_set_each` and accept an `all` flag
+- Add `strip_internal_json_markers` helper in `chat.rb`
 - Add `choose_file_set` helper in `OllamaChat::Dialog` returning a `Set` of
   expanded `Pathname` objects
 
 ### Source Fetching & Links
 
-- Refactor `source_fetching.rb` to coerce sources to string  
+- Refactor `source_fetching.rb` to coerce sources to string
 - Add a lazy `links` method and remove the old `links` method from `Chat`
 
 ### Retrieval Snippets
 
 - Update retrieval‑snippet injection to use a JSON block instead of a
-  plain‑text list  
+  plain‑text list
 - Use `strip_internal_json_markers` for `:ollama_chat_retrieval_snippets` and
-  `:ollama_chat_runtime_information`  
+  `:ollama_chat_runtime_information`
 - Truncate user query to `config.embedding.model.context_length` before calling
   `@documents.find_where`
 
 ### Directory Structure Tool
 
-- Add `suffix` parameter to `directory_structure` function  
+- Add `suffix` parameter to `directory_structure` function
 - Update `OllamaChat::Utils::AnalyzeDirectory.generate_structure` to accept a
-  `suffix:` argument and filter files accordingly  
+  `suffix:` argument and filter files accordingly
 - Ensure only files matching the given extension are included; hidden files and
   symlinks remain excluded
 
 ### Persona Management
 
-- Update persona option labels to `keep`, `reload_default`, `choose_different`  
-- Add interactive persona reload options via a menu in `reload_default_persona`  
-- Use `SearchUI::Wrapper` and `OllamaChat::Utils::Chooser` for selection  
+- Update persona option labels to `keep`, `reload_default`, `choose_different`
+- Add interactive persona reload options via a menu in `reload_default_persona`
+- Use `SearchUI::Wrapper` and `OllamaChat::Utils::Chooser` for selection
 - Update `@default_persona` when selecting “load_new”
 
 ### Path Validation
 
-- Add `check_file` flag to `path_validator.rb` method signature  
-- Guard against non‑directory parents and file existence when `check_file:true`  
+- Add `check_file` flag to `path_validator.rb` method signature
+- Guard against non‑directory parents and file existence when `check_file:true`
 - Propagate `check_file` flag in calls from `file_context`, `patch_file`, and
   `read_file`
 
 ### Tests & Specs
 
 - Adjust specs to stub `OC::PAGER`, expect `use_pager` yielding a `StringIO`,
-  and verify `STDOUT.puts` calls  
-- Update test expectations for new command handling and help output  
+  and verify `STDOUT.puts` calls
+- Update test expectations for new command handling and help output
 - Expect `OllamaChat::InvalidPathError` instead of `Errno::ENOENT` in relevant
-  specs  
+  specs
 - Add `asset_pathname` helper in `spec_helper.rb`
 
 ### Miscellaneous
 
-- Add `reline` gem to `.utilsrc` dependency list  
+- Add `reline` gem to `.utilsrc` dependency list
 - Consider `-c` flag to skip persona setup when loading an existing
-  conversation  
+  conversation
 - Standardize `register_name` method comments to `@return [String] the
-  registered name for this tool`  
+  registered name for this tool`
 
 ## 2026-03-13 v0.0.79
 
-- Added `tmp/*` to Rakefile ignore list for cleaner builds.  
-- Updated gemspec: changed `s.rubygems_version` to **3.6.9**.  
-- Added `logging.rb` to `extra_rdoc_files` and `files` in gemspec.  
-- Adjusted gemspec file list to reflect new structure.  
-- Removed `Runtime Directory` (`-d`) explanation from `README.md`.  
-- Updated URL in `README.md`.  
+- Added `tmp/*` to Rakefile ignore list for cleaner builds.
+- Updated gemspec: changed `s.rubygems_version` to **3.6.9**.
+- Added `logging.rb` to `extra_rdoc_files` and `files` in gemspec.
+- Adjusted gemspec file list to reflect new structure.
+- Removed `Runtime Directory` (`-d`) explanation from `README.md`.
+- Updated URL in `README.md`.
 - Added explicit check that `args.path.full?` is true before calling
   `assert_valid_path`, raising `ArgumentError` with message `'require path to
-  file to be patched'`.  
+  file to be patched'`.
 - Updated path assignment to first validate presence, then assert validity
-  against `config.tools.functions.patch_file.allowed?`.  
+  against `config.tools.functions.patch_file.allowed?`.
 - Updated `OllamaChat::Tools::ExecuteGrep` to accept new options `before`,
-  `after`, and `context`.  
-- Added helper method `normalize_number` for optional integer arguments.  
+  `after`, and `context`.
+- Added helper method `normalize_number` for optional integer arguments.
 - Adjusted command template in `default_config.yml` to include `-B`, `-A`, and
-  `-C` flags based on provided values.  
+  `-C` flags based on provided values.
 - Refactored logging: replaced `logger.error` / `logger.warn` calls with
-  `log(:error, …)` or `log(:warn, …)` across multiple files.  
+  `log(:error, …)` or `log(:warn, …)` across multiple files.
 - Added optional `warn: true` flag to new helper so that critical errors also
   trigger a user‑visible warning output while still being written to the log
-  file.  
+  file.
 - Implemented `OllamaChat::Logging#log(severity, msg, warn:)` in `logging.rb`;
   it formats exceptions with backtraces and forwards messages to the underlying
-  Ruby `Logger`.  
+  Ruby `Logger`.
 - Updated `spec_helper.rb` by adding a global `config.before` hook that sets
   temporary paths for `OC::OLLAMA::CHAT::HISTORY` and `LOGFILE` so all specs
-  run against isolated files.  
-- Added `tmp/*` to `.gitignore`.  
+  run against isolated files.
+- Added `tmp/*` to `.gitignore`.
 - Created new module `OllamaChat::Logging` that lazily builds a Logger writing
-  to the file defined by `OC::OLLAMA::CHAT::LOGFILE` in XDG STATE.  
+  to the file defined by `OC::OLLAMA::CHAT::LOGFILE` in XDG STATE.
 - Required this logging module in `lib/ollama_chat.rb` and included it in
-  `class OllamaChat::Chat` so every chat instance has access to `logger`.  
+  `class OllamaChat::Chat` so every chat instance has access to `logger`.
 - Logged connection messages via `@chat.logger.info` before printing the
-  “Connecting …” line in `OllamaChat::Dialog#connect_message`.  
+  “Connecting …” line in `OllamaChat::Dialog#connect_message`.
 - Centralized tool‑call error handling: log unconfigured, unregistered or
   disabled tools with `@chat.logger.error`, and record each executed function
-  payload using `JSON.pretty_generate`.  
+  payload using `JSON.pretty_generate`.
 - Introduced an explicit vs implicit confirmation flow (`:explicit`,
   `:implicite`, `:denied`) in `OllamaChat::FollowChat#follow_chat` and log the
-  outcome accordingly.  
+  outcome accordingly.
 - Switched chat history storage from XDG CACHE to XDG STATE by updating
   `OC::OLLAMA::CHAT::HISTORY` path, adjusting file operations in
   `lib/ollama_chat/history.rb`, and adding a new config entry for `LOGFILE`
-  under state home in `oc.rb`.  
+  under state home in `oc.rb`.
 - Enhanced PatchFile tool: updated documentation to specify `unified diff
-  format` and `JSON response`.  
-- Added private method `digest` that returns `MD5` of a file path.  
+  format` and `JSON response`.
+- Added private method `digest` that returns `MD5` of a file path.
 - Modified `apply_patch` to compute old digest, run patch command, compare
-  digests, set `success` flag accordingly.  
+  digests, set `success` flag accordingly.
 - Improved error handling: now includes `success`, clearer messages, empty
   result on failure.
 
@@ -229,64 +260,64 @@
   inserted `%{time}` placeholder into prompts section of `default_config.yml`;
   added Git placeholders (`%{git_current_branch}`, `%{git_remote_origin}`)
   under **Git** key; reformatted terminal info under a single **Terminal**
-  heading with height and width.  
+  heading with height and width.
 - Extend weather tool to include six‑day forecast: updated `GetCurrentWeather`
   description to mention a six‑day forecast; functionality unchanged; tool
-  still requires no arguments.  
+  still requires no arguments.
 - Rename `insert_into_editor` tool to `paste_into_editor`: updated
   `lib/ollama_chat/tools.rb` to require `paste_into_editor`; renamed and
   updated class from `InsertIntoEditor` to `PasteIntoEditor` in
   `paste_into_editor.rb`, changing its register name, description text, and
   method logic; switched default config key in `default_config.yml` from
   `insert_into_editor` to `paste_into_editor`; refactored spec files; adjusted
-  all internal references.  
+  all internal references.
 
 ## 2026-03-09 v0.0.76
 
 - Added `client:` and `current_directory:` keys to `runtime_info_values` in
-  `chat.rb`.  
+  `chat.rb`.
 - Implemented `#client` method returning `"progname **0.0.75**"` in
-  `information.rb`.  
-- Introduced helper `location_description?` in `location_handling.rb`.  
+  `information.rb`.
+- Introduced helper `location_description?` in `location_handling.rb`.
 - Simplified `MessageList#to_ary` to return a duplicate of the internal array,
-  removing automatic system prompt + location injection.  
+  removing automatic system prompt + location injection.
 - Updated default config placeholders for `%{client}` and
-  `%{current_directory}` in `default_config.yml`.  
+  `%{current_directory}` in `default_config.yml`.
 - Adjusted web searching logic to use `location_description?` instead of
-  deprecated methods.  
+  deprecated methods.
 - Removed tests that expected location‑augmented system prompts from
-  `spec/ollama_chat/message_list_spec.rb`.  
+  `spec/ollama_chat/message_list_spec.rb`.
 - Standardized JSON output formatting across tools: aligned JSON keys, added
   spaces after commas, and added trailing commas in tool responses such as
   `copy_to_clipboard`, `gem_path_lookup`, `generate_password`, `get_endoflife`,
   `get_rfc`, `insert_into_editor`, `open_file_in_editor`,
-  `paste_from_clipboard`, and `search_web`.  
+  `paste_from_clipboard`, and `search_web`.
 - Added trailing commas to JSON objects for consistency and easier future
-  edits.  
+  edits.
 - Standardized error field formatting, ensuring each error block includes a
-  space after the colon and a trailing comma where appropriate.  
+  space after the colon and a trailing comma where appropriate.
 - Added helper `disable_content_parsing` in `chat.rb` that sets `@parse_content
-  = false`.  
+  = false`.
 - Refactored command handlers to call `disable_content_parsing` instead of
-  assigning directly to `@parse_content`.  
+  assigning directly to `@parse_content`.
 - Updated persona setup logic so that a returned persona result triggers
   `disable_content_parsing`; otherwise parsing is enabled with
-  `enable_command_completion`.  
-- Added explanatory comments around the new helper for clarity.  
+  `enable_command_completion`.
+- Added explanatory comments around the new helper for clarity.
 - Improved clean flow: captured return value of `clean` and set `@parse_content
-  = true` when a persona profile is returned.  
+  = true` when a persona profile is returned.
 - Replaced old flag `@persona_setup` with `@default_persona`; ensured it
-  defaults to `:none` in an `ensure` block after setup.  
+  defaults to `:none` in an `ensure` block after setup.
 - Added new method `reload_default_persona` that prompts for confirmation
-  before reloading the default persona file if one exists.  
+  before reloading the default persona file if one exists.
 - Modified `clean(what)` to return the result of `reload_default_persona`,
-  enabling the caller to react to a reload.  
+  enabling the caller to react to a reload.
 - Adjusted `/clear` command handling in the chat loop to use the returned value
-  from `clean` and only proceed when nothing is returned.  
+  from `clean` and only proceed when nothing is returned.
 - Renamed local variable `runtime_info` to `runtime_info_values` in `chat.rb`
-  for clarity.  
+  for clarity.
 - Updated runtime info prompt interpolation to use `runtime_info_values`
-  instead of `runtime_info`.  
+  instead of `runtime_info`.
 - Updated `/.utilsrc` by adding gems to the `code_indexer` configuration:
   `all_images`, `const_conf`, `context_spook`, `csv`, `fileutils`, `gem_hadar`,
   `infobar`, `irb`, `kramdown`, and `kramdown-parser-gfm`.
@@ -298,28 +329,28 @@
   prompt, and normalizing tool name handling.
 - Added new tool `OllamaChat::Tools::ResolveTag` with utility
   `OllamaChat::Utils::TagResolver` to parse tag files; enabled in
-  `default_config.yml` and added corresponding tests.  
+  `default_config.yml` and added corresponding tests.
 - Introduced `runtime_info` switch in `OllamaChat::Switches`; added
   `/runtime_info` command handling in `chat.rb`, runtime info block injection,
   and display via `information.rb`; added `prompts/runtime_info` template and
   `languages:` array; added `runtime_info.toggle`, `runtime_info.show`,
-  `runtime_info.on?`, `runtime_info.enabled` support.  
+  `runtime_info.on?`, `runtime_info.enabled` support.
 - Updated `OllamaChat::Tools::DirectoryStructure` description to note it can
-  locate one or multiple files, referencing `max_depth`.  
+  locate one or multiple files, referencing `max_depth`.
 - Clarified usage of `browse`, `copy_to_clipboard`, `open_file_in_editor`,
   `insert_into_editor` tools in documentation strings; fixed double‑negative
-  typo in `insert_into_editor.rb`.  
+  typo in `insert_into_editor.rb`.
 - Renamed `import_url` tool to `get_url`: updated config key, tool
   registration, class name `OllamaChat::Tools::GetURL`, spec file names, method
   calls to `config.tools.functions.get_url.schemes?`, replaced all
-  `chat.import` with `OllamaChat::Utils::Fetcher.get`.  
+  `chat.import` with `OllamaChat::Utils::Fetcher.get`.
 - Added path validation and error handling to `OllamaChat::Tools::RunTests`:
   new private method `check_path(path)` prevents using `"./"` and validates
   existence; wrapped execution in rescue block returning JSON with `error:` and
-  `message:`; updated function description accordingly.  
-- Refined and unified tool descriptions with consistent punctuation.  
+  `message:`; updated function description accordingly.
+- Refined and unified tool descriptions with consistent punctuation.
 - Added explicit persona loading verification when editing: confirmation step
-  before applying edited personality configurations.  
+  before applying edited personality configurations.
 - Improved persona loading and prompt formatting: updated
   `setup_persona_from_opts`, `info_persona`, `load_persona_file` to return
   `[pathname, content]`, added newline in `play_persona_prompt`, adjusted

data/Rakefile

@@ -41,7 +41,7 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.18'
+  dependency             'ollama-ruby',           '~> 1.21'
   dependency             'documentrix',           '>= 0.0.4'
   dependency             'unix_socks',            '~> 0.3'
   dependency             'rss',                   '~> 0.3'
@@ -49,7 +49,7 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'kramdown-ansi',         '~> 0.3'
+  dependency             'kramdown-ansi',         '~> 0.5'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.52'
   dependency             'search_ui',             '~> 0.1'

data/lib/ollama_chat/chat.rb

@@ -492,7 +492,7 @@ class OllamaChat::Chat
           STDOUT.puts "Exiting chooser."
           break
         when '[ALL]'
-          if confirm?(prompt: 'Are you sure? (y/n) ') =~ /y/i
+          if confirm?(prompt: '🔔 Are you sure? (y/n) ') =~ /y/i
             @documents.clear
             STDOUT.puts "Cleared collection #{bold{@documents.collection}}."
             break
@@ -537,7 +537,7 @@ class OllamaChat::Chat
       end
     when 'edit'
       if result = edit_persona and
-          confirm?(prompt: 'Load new persona profile? (y/n) ') =~ /y/i
+          confirm?(prompt: '🔔 Load new persona profile? (y/n) ') =~ /y/i
         then
         result
       else
@@ -868,7 +868,7 @@ class OllamaChat::Chat
           STDOUT.puts "Exiting chooser."
           break
         when '[ALL]'
-          if confirm?(prompt: 'Are you sure? (y/n) ') =~ /y/i
+          if confirm?(prompt: '🔔 Are you sure? (y/n) ') =~ /y/i
             links.clear
             STDOUT.puts "Cleared all links in list."
             break
@@ -916,7 +916,7 @@ class OllamaChat::Chat
       @documents.clear
       STDOUT.puts "Cleared all tags."
     when 'all'
-      if confirm?(prompt: 'Are you sure to clear messages and collection? (y/n) ') =~ /y/i
+      if confirm?(prompt: '🔔 Are you sure to clear messages and collection? (y/n) ') =~ /y/i
         messages.clear
         @documents.clear
         links.clear

data/lib/ollama_chat/config_handling.rb

@@ -58,7 +58,7 @@ module OllamaChat::ConfigHandling
     unless diff_tool = OC::DIFF_TOOL?
       exit 1
     end
-    if confirm?(prompt: 'Do you want to fix the config? (y/n) ') =~ /y/i
+    if confirm?(prompt: '🔔 Do you want to fix the config? (y/n) ') =~ /y/i
       system Shellwords.join([
         diff_tool,
         @ollama_chat_config.filename,
@@ -84,7 +84,7 @@ module OllamaChat::ConfigHandling
   #    `ollama_chat` if desired.
   def edit_config
     if result = edit_file(@ollama_chat_config.filename)
-      if confirm?(prompt: "Do you want to restart #{progname}? (y/n) ") =~ /y/i
+      if confirm?(prompt: "🔔 Do you want to restart #{progname}? (y/n) ") =~ /y/i
         save_conversation(OC::XDG_CACHE_HOME + 'backup.json')
         save_history
         exec($0, *ARGV)
@@ -101,7 +101,7 @@ module OllamaChat::ConfigHandling
   # @example Restarting the app after confirmation
   #   config.reload_config  # => restarts if user answers "y"
   def reload_config
-    if confirm?(prompt: "Do you want to restart #{progname}? (y/n) ") =~ /y/i
+    if confirm?(prompt: "🔔 Do you want to restart #{progname}? (y/n) ") =~ /y/i
       save_conversation(OC::XDG_CACHE_HOME + 'backup.json')
       save_history
       exec($0, *ARGV)

data/lib/ollama_chat/conversation.rb

@@ -27,7 +27,7 @@ module OllamaChat::Conversation
   #   chat.save_conversation('conversations/2023-10-15_my_session.json')
   def save_conversation(filename)
     File.exist?(filename) &&
-      confirm?(prompt: "File #{filename.to_s.inspect} already exists, overwrite? (y/n) ") !~ /y/i and
+      confirm?(prompt: "🔔 File #{filename.to_s.inspect} already exists, overwrite? (y/n) ") !~ /y/i and
       return
     if messages.save_conversation(filename)
       STDOUT.puts "Saved conversation to #{filename.to_s.inspect}."

data/lib/ollama_chat/dialog.rb

@@ -27,15 +27,31 @@ module OllamaChat::Dialog
   # from the user in raw mode, then returns that character. This is best used
   # for confirmation prompts.
   #
-  # @param prompt [ String ] the prompt to display to the user.
-  # @return [ String ] the character entered by the user.
-  def confirm?(prompt:)
+  # @param prompt   [String]  the prompt to display to the user
+  # @param timeout  [Integer, nil] optional timeout in seconds; if nil, the
+  #   method blocks until input, if 0 the method immediatly returns the default
+  #   value.
+  # @param default  [Object, nil]  value returned when the timeout expires
+  #   (defaults to `nil`)
+  #
+  # @return [Object] the character entered by the user, or the `default` value
+  #   if a timeout occurs
+  def confirm?(prompt:, timeout: nil, default: nil)
+    return default if timeout&.zero?
+    if prompt.include?('%s')
+      prompt = prompt % (timeout ? ('timeout in %us' % timeout) : 'no timeout')
+    end
     print prompt
     system 'stty raw'
-    c = STDIN.getc
+    c = if timeout
+          ready = IO.select([ STDIN ], nil, nil, timeout)
+          ready ? STDIN.getc : nil
+        else
+          STDIN.getc
+        end
     system 'stty cooked'
     puts
-    c
+    c || default
   end
 
   private
@@ -78,13 +94,13 @@ module OllamaChat::Dialog
   #
   # @param current_collection [ String, nil ] the name of the currently active collection
   def choose_collection(current_collection)
-    collections = [ current_collection ] + @documents.collections
+    collections = [ current_collection ] + @documents.collections.to_a
     collections = collections.compact.map(&:to_s).uniq.sort
     collections.unshift('[EXIT]').unshift('[NEW]')
     collection = OllamaChat::Utils::Chooser.choose(collections) || current_collection
     case collection
     when '[NEW]'
-      @documents.collection = ask?(prompt: "Enter name of the new collection: ")
+      @documents.collection = ask?(prompt: "❓ Enter name of the new collection: ")
     when nil, '[EXIT]'
       STDOUT.puts "Exiting chooser."
     when /./
@@ -122,7 +138,7 @@ module OllamaChat::Dialog
       system =
         case chosen
         when '[NEW]'
-          ask?(prompt: "Enter new system prompt to use: ")
+          ask?(prompt: "❓ Enter new system prompt to use: ")
         when '[EXIT]'
           STDOUT.puts "Exiting chooser."
           return

data/lib/ollama_chat/follow_chat.rb

@@ -100,6 +100,12 @@ class OllamaChat::FollowChat
 
     response.message.tool_calls.each do |tool_call|
       name = tool_call.function.name
+      if name =~ %r(/)
+        new_name = File.basename(name.to_s)
+        msg = "Received namespaced tool call for #{name}, correcting to #{new_name}"
+        @chat.log(:warn, msg)
+        name = new_name
+      end
       unless @chat.tool_configured?(name)
         msg = "Error: Unconfigured tool named %s ignored => Skip.\n" % name
         @chat.tool_call_results[name] = msg
@@ -123,7 +129,7 @@ class OllamaChat::FollowChat
       function = JSON.pretty_generate(tool_call.function)
       @chat.log(:info, function)
       if @chat.tool_function(name).require_confirmation?
-        prompt = "I want to execute tool %s\n%s\nConfirm? (y/n) " % [
+        prompt = "🔔 I want to execute tool %s\n%s\nConfirm? (y/n) " % [
           bold { name },
           italic { function  },
         ]
@@ -178,9 +184,12 @@ class OllamaChat::FollowChat
 
     if tools_used.full?
       infobar.reset
-      puts "🔧 Tool functions returned result:",
-        tools_used.to_yaml.sub(/\A---\s*\n/, '').gsub(/^/, '  '), ""
-      @chat.confirm?(prompt: 'Press any key to continue.')
+      tools_used.each do |name, info|
+        puts "🔧 Tool functions #{name} returned result:",
+          info.to_yaml.sub(/\A---\s*\n/, '').gsub(/^/, '  '), ""
+        timeout = @chat.tool_function(name).result_display_timeout?
+        @chat.confirm?(prompt: '⏎  Press any key to continue (%s). ', timeout:)
+      end
     end
   end
 

data/lib/ollama_chat/message_output.rb

@@ -83,7 +83,7 @@ module OllamaChat::MessageOutput
   def attempt_to_write_file(filename, message)
     path = Pathname.new(filename.to_s).expand_path
     if !path.exist? ||
-        confirm?(prompt: "File #{path.to_s.inspect} already exists, overwrite? (y/n) ") =~ /y/i
+        confirm?(prompt: "🔔 File #{path.to_s.inspect} already exists, overwrite? (y/n) ") =~ /y/i
     then
       File.open(path, ?w) do |output|
         output.write(message.content)

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -156,34 +156,43 @@ tools:
   enabled: true
   functions:
     get_current_weather:
+      result_display_timeout: 3
       url: "https://api.pirateweather.net/forecast/KeyInHeader/%{lat},%{lon}?units=%{units}"
       default: false
     get_cve:
+      result_display_timeout: 3
       url: 'https://cveawg.mitre.org/api/cve/%{cve_id}'
       default: true
     get_endoflife:
+      result_display_timeout: 3
       url: "https://endoflife.date/api/v1/products/%{product}"
       default: false
     get_time:
+      result_display_timeout: 3
       default: true
     get_location:
+      result_display_timeout: 3
       default: true
     file_context:
       default: false
       require_confirmation: false
+      result_display_timeout: 3
       allowed:
         - './spec'
     directory_structure:
       default: true
       require_confirmation: false
+      result_display_timeout: 3
       exclude:
         - corpus
         - pkg
     execute_grep:
       default: true
+      result_display_timeout: 3
       cmd: |
         grep #{'-i' if ignore_case} -m #{max_results} -r #{before.full? { "-B %u " % it }}#{after.full? { "-A %u " % it }}#{context.full? { "-C %u " % it }}#{pattern} #{path}
     browse:
+      result_display_timeout: 3
       default: true
     write_file:
       default: true
@@ -193,6 +202,7 @@ tools:
     read_file:
       default: true
       require_confirmation: false
+      result_display_timeout: 3
       allowed:
         - './tmp'
         - './lib'
@@ -200,42 +210,54 @@ tools:
     search_web:
       default: true
       require_confirmation: true
+      result_display_timeout: 3
       max_results: 25
     get_url:
       default: true
       require_confirmation: true
+      result_display_timeout: 3
       schemes:
         - http
         - https
     gem_path_lookup:
+      result_display_timeout: 3
       default: true
     open_file_in_editor:
       default: true
       require_confirmation: true
+      result_display_timeout: 0
     run_tests:
       require_confirmation: true
+      result_display_timeout: 3
       default: true
       allowed:
         - "./spec"
         - "./test"
         - "./tests"
     get_jira_issue:
+      result_display_timeout: 3
       default: false
     get_rfc:
       url: "https://www.rfc-editor.org/rfc/rfc%{rfc_id}.txt"
+      result_display_timeout: 3
       default: true
     generate_password:
       default: true
     copy_to_clipboard:
+      result_display_timeout: 3
       default: true
     paste_from_clipboard:
+      result_display_timeout: 3
       default: true
     paste_into_editor:
+      result_display_timeout: 3
       require_confirmation: true
       default: true
     execute_ri:
+      result_display_timeout: 3
       default: true
     resolve_tag:
+      result_display_timeout: 3
       default: true
     patch_file:
       default: true

data/lib/ollama_chat/personae_management.rb

@@ -127,7 +127,7 @@ module OllamaChat::PersonaeManagement
   #   if the user cancels.
   def add_persona
     persona_name = ask?(
-      prompt: "Enter the name of the new persona (or press return to cancel): "
+      prompt: "❓ Enter the name of the new persona (or press return to cancel): "
     ).full? or return
 
     pathname = personae_directory + "#{persona_name}.md"
@@ -173,7 +173,7 @@ module OllamaChat::PersonaeManagement
         STDOUT.puts "Deleting '#{bold{persona.sub_ext('')}}'..."
         STDOUT.puts "Backup will be saved to: #{backup_pathname}"
 
-        if confirm?(prompt: "Are you sure? (y/n) ") =~ /y/i
+        if confirm?(prompt: "🔔 Are you sure? (y/n) ") =~ /y/i
           FileUtils.mv pathname, backup_pathname
           STDOUT.puts "✅ Persona #{bold{persona.sub_ext('')}} deleted successfully"
           {

data/lib/ollama_chat/server_socket.rb

@@ -117,7 +117,7 @@ module OllamaChat::ServerSocket
       running using the same directory or that a previous process left a stale
       socket file.
     EOT
-    if confirm?(prompt: 'Do you want to remove the existing socket file and continue? (y/n) ') =~ /y/i
+    if confirm?(prompt: '🔔 Do you want to remove the existing socket file and continue? (y/n) ') =~ /y/i
       FileUtils.rm_f socket_path
       retry
     else

data/lib/ollama_chat/tools/paste_into_editor.rb

@@ -15,11 +15,10 @@ class OllamaChat::Tools::PasteIntoEditor
       function: Tool::Function.new(
         name:,
         description: <<~EOT,
-          Editor helper – Pastes a string (or last reply if omitted) straight
-          into the User’s running editor.
-          If no `text` is supplied, the tool will automatically use the last assistant
-          response. Do not not call this tool function unless explicitly
-          requested by the user.
+          Editor helper – Pastes a text (or last reply if omitted) into
+          the editor, no file or line is required.
+          If no `text` is supplied, the tool will automatically use the last
+          assistant response.
         EOT
         parameters: Tool::Function::Parameters.new(
           type: 'object',

data/lib/ollama_chat/tools/resolve_tag.rb

@@ -32,7 +32,7 @@ class OllamaChat::Tools::ResolveTag
             ),
             kind: Tool::Function::Parameters::Property.new(
               type: 'string',
-              description: 'Optional tag kind (e.g., f for function, v for variable).'
+              description: 'Optional tag kind (%s).' % OllamaChat::Utils::TagResolver.kinds.to_json
             ),
             directory: Tool::Function::Parameters::Property.new(
               type: 'string',

data/lib/ollama_chat/utils/tag_resolver.rb

@@ -10,19 +10,26 @@ class OllamaChat::Utils::TagResolver
   HEADERS = %i[ symbol filename regexp kind rest ]
   private_constant :HEADERS
 
-  # Return a human‑readable description of a ctags tag kind. For example, `f`
-  # (function) becomes "methods".
+  # The kinds method returns a mapping of single character kind identifiers to
+  # human‑readable descriptions for Ruby ctags kinds.
   #
-  # @param [String] kind The single character kind identifier from the tags file.
-  # @return [String]
-  def self.kind_of(kind)
+  # @return [Hash] a hash mapping kind identifiers to their descriptions.
+  def self.kinds
     ctags = ::OC::OLLAMA::CHAT::TOOLS::CTAGS_TOOL? or
       raise OllamaChat::ConfigMissingError,
       'need ctags tool path defined in %s' % (
         ::OC::OLLAMA::CHAT::TOOLS::CTAGS_TOOL!.env_var_name
       )
     @kinds ||= `#{ctags} --list-kinds=Ruby`.lines.map { _1.chomp.split(/\s+/, 2) }.to_h
-    @kinds.fetch(kind, 'unknown')
+  end
+
+  # Return a human‑readable description of a ctags tag kind. For example, `f`
+  # (function) becomes "methods".
+  #
+  # @param [String] kind The single character kind identifier from the tags file.
+  # @return [String]
+  def self.kind_of(kind)
+    kinds.fetch(kind, 'unknown')
   end
 
   # A lightweight struct representing a single tag entry. It extends the base
@@ -85,7 +92,7 @@ class OllamaChat::Utils::TagResolver
     results       = []
     @tags_file.each_line do |line|
       line.chomp!
-      line =~ /\A([^\t]+)\t([^\t]+)\t\/\^([^\t]+)\$\/\;"\t([^\t])\t([^\t]+)$/ or next
+      line =~ /\A([^\t]+)\t([^\t]+)\t\/\^([^\t]+)\$\/\;"\t([^\t])(.*)/ or next
       obj = TagResult.new(*$~.captures)
       next unless obj.symbol == symbol
       if kind

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.81'
+  VERSION         = '0.0.83'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.81 ruby lib
+# stub: ollama_chat 0.0.83 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.81".freeze
+  s.version = "0.0.83".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
-  s.rubygems_version = "3.6.9".freeze
+  s.rubygems_version = "4.0.8".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
   s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/state_selectors_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/tools/browse_spec.rb".freeze, "spec/ollama_chat/tools/copy_to_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/directory_structure_spec.rb".freeze, "spec/ollama_chat/tools/execute_grep_spec.rb".freeze, "spec/ollama_chat/tools/execute_ri_spec.rb".freeze, "spec/ollama_chat/tools/file_context_spec.rb".freeze, "spec/ollama_chat/tools/gem_path_lookup_spec.rb".freeze, "spec/ollama_chat/tools/generate_password_spec.rb".freeze, "spec/ollama_chat/tools/get_current_weather_spec.rb".freeze, "spec/ollama_chat/tools/get_cve_spec.rb".freeze, "spec/ollama_chat/tools/get_endoflife_spec.rb".freeze, "spec/ollama_chat/tools/get_jira_issue_spec.rb".freeze, "spec/ollama_chat/tools/get_location_spec.rb".freeze, "spec/ollama_chat/tools/get_rfc_spec.rb".freeze, "spec/ollama_chat/tools/get_time_spec.rb".freeze, "spec/ollama_chat/tools/get_url_spec.rb".freeze, "spec/ollama_chat/tools/open_file_in_editor_spec.rb".freeze, "spec/ollama_chat/tools/paste_from_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/paste_into_editor_spec.rb".freeze, "spec/ollama_chat/tools/patch_file_spec.rb".freeze, "spec/ollama_chat/tools/read_file_spec.rb".freeze, "spec/ollama_chat/tools/resolve_tag_spec.rb".freeze, "spec/ollama_chat/tools/run_tests_spec.rb".freeze, "spec/ollama_chat/tools/search_web_spec.rb".freeze, "spec/ollama_chat/tools/write_file_spec.rb".freeze, "spec/ollama_chat/utils/analyze_directory_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/utils/path_completer_spec.rb".freeze, "spec/ollama_chat/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<context_spook>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.18".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.21".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.0.4".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
-  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.3".freeze])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.5".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.52".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.1".freeze])

data/spec/ollama_chat/tools/resolve_tag_spec.rb

@@ -5,6 +5,12 @@ describe OllamaChat::Tools::ResolveTag do
 
   connect_to_ollama_server
 
+  before do
+    const_conf_as(
+      'OC::OLLAMA::CHAT::TOOLS::CTAGS_TOOL'  => 'true'
+    )
+  end
+
   it 'can have name' do
     expect(described_class.new.name).to eq 'resolve_tag'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.83
 platform: ruby
 authors:
 - Florian Frank
@@ -155,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -267,14 +267,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement
@@ -703,7 +703,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.8
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: