ollama_chat 0.0.82 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dfcb462fdb59e2b4cf31ef8d489627982e71c88cfc9dea8c89597607311e95d
-  data.tar.gz: 1fed1ad543d810ddf0b54b5390b8a031cf3108bd67d56a9a91b5917fc2cdd219
+  metadata.gz: 8947d6cdb437ce85afb32cb689bad1b16de54c2afb35da9f0eac7b1f1fff19df
+  data.tar.gz: 3a03448c69d3f8883e11d5de11e9f44c455a4a8e95e2d93593d945dc99a0be63
 SHA512:
-  metadata.gz: fe1384443f22e5890a784be50a632c9a4d15e8fbf72f0084acf99016aa46a741320af818a72d3797007bced8f0f47155001a12e0103be3ac35f2fb6beba8db6d
-  data.tar.gz: e79cd80f16e97778f6e61451b7aefbbfdf44a1a08cdce5029a21e050f78461fcf11e198ae04e9e0845d2ed9426057c5616333a09bc9d8eaf391be7a3b8c4d290
+  metadata.gz: 02e28130adb2881c44ea053035b5b39eb43025bf0e761063e6442a031b8b8acd88fe588850438ff0ae3c9fcf039ca4cff32bcb5abae4bcca4a349852a217580b
+  data.tar.gz: 1055061e111fff2384020505b467b60ab30facc7fbf5733856061adc6834401a5414ba28a6716452b5b5fe2bb8ec5a77d54fc81d2e3ed065f0b9568847ce326c

data/CHANGES.md

@@ -1,5 +1,22 @@
 # 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`

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,7 +94,7 @@ 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

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
@@ -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/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/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.82'
+  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.82 ruby lib
+# stub: ollama_chat 0.0.83 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.82".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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.82
+  version: 0.0.83
 platform: ruby
 authors:
 - Florian Frank