ollama_chat 0.0.129 → 0.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aae892b3b152a70e519a4d5a6268f046611c55d5b8ecfda66e2e4386a4681db
-  data.tar.gz: '038e498781b238aef6f3d6ff595ec3beb50d00b7efd722f8636bcb87a273bbb2'
+  metadata.gz: 01d91ba996f30f84990c3d3eb60d0e65cc46b3eb0c593bd55eab6cc580e935e1
+  data.tar.gz: 28563308f748187b5cf15dcad886a775dcb6d2abd3c4466ab66854a10dec63fd
 SHA512:
-  metadata.gz: 740289c0e7fdf453718f120f26fa201f68c1f677777b71e440789df72bb14db52526026114adb06ce15a2ea93b78ce6e39a478bfe77a22c1657692e1a5162445
-  data.tar.gz: 1b553c6648636b5088857f199a21cd87b86836c59df746fa50c504569be8609fd0181c3b233dda977a065cefdddfda1cd7ce7640a154a742bef8ab7392513346
+  metadata.gz: edb330105098a15cb10bb0edaaca0131c1f339568c5639d2bc75b02adfaf1a4e0b94176e663e45784e9fb0d978732c854a680b937d135205bcb88c943c02c8b0
+  data.tar.gz: 2dff67556aab12d5ad4a9a72239ffa34982804cfa311970a42bf35af33ad1e848baf94f82d74e9e65f21724019963b016c05823fa7e1ec40e01f7b511c1824fd

data/CHANGES.md

@@ -1,5 +1,27 @@
 # Changes
 
+## 2026-10-08 v0.0.130
+
+*   Replace `ask?` with `confirm?` in `rag_handling.rb` for the `[v]iew` /
+    `[c]lear` prompts in `#clear_collection_tags` and
+    `#clear_collection_sources` to bypass `Reline` and keep command history
+    clean.
+*   Add `use_pager(force: true)` in the `#clear_collection_sources` view branch
+    to fix display.
+*   Rewrite `confirm?` YARD documentation in `dialog.rb` to clarify the
+    two-branch return contract (`yes: nil` → raw char, `yes:` matcher → matched
+    char or `nil`) and history-pollution rationale.
+*   Swap 7 `ask?` → `confirm?` stubs in `rag_handling_spec.rb`.
+*   Add `line_numbers: true` to the `read_file` tool block in
+    `default_config.yml`.
+*   Update `read_file.rb` to fall back to `tool_config.line_numbers?` when the
+    model omits the argument and interpolate the live default into the tool
+    description.
+*   Fix typo in description: `linenumbers` → `line numbers`.
+*   Update specs to extract `let :tool`, adjust `nil`-arg expectations for the
+    `1: ` prefix, checksum, and `line_count`, and add a new spec asserting raw
+    content when `tool_config.line_numbers` is stubbed to `false`.
+
 ## 2026-10-08 v0.0.129
 
 ### Features

data/lib/ollama_chat/dialog.rb

@@ -29,21 +29,37 @@ module OllamaChat::Dialog
     prefill and Reline.pre_input_hook = old_pre_input_hook
   end
 
-  # The confirm? method displays a prompt and reads a single character input
-  # from the user in raw mode, then returns that character. This is best used
-  # for confirmation prompts.
+  # The confirm? method displays a prompt and reads a **single keypress**
+  # from the user in raw mode (no Enter required), returning that character.
+  # Unlike {#ask?}, it does not go through Reline, so it never pollutes the
+  # command history — making it the right tool for confirmation gates *and*
+  # terse single-key selections such as `[v]iew` / `[c]lear` menus.
+  #
+  # The returned value depends on whether a positive-response matcher (`yes`)
+  # is supplied:
+  #
+  # - `yes: nil` (default) — the raw keypress is returned verbatim so the
+  #   caller can dispatch on it (e.g. `case key; when /\Av/i; ...`); on
+  #   timeout the `default` value is returned, and on interrupt (Ctrl-C)
+  #   `nil` is returned.
+  # - `yes: <Regexp/Object>` — the keypress is returned only when it
+  #   satisfies `yes === keypress` (e.g. `yes: /\Ay/i`); any other keypress,
+  #   or an interrupt, yields `nil`.
   #
   # @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 immediately returns the default
-  #   value.
+  #   method blocks until input, if 0 it immediately returns the `default`
+  #   value without waiting.
   # @param default  [Object, nil]  value returned when the timeout expires
   #   (defaults to `nil`)
-  # @param yes      [Object, nil]  value that is considered a positive response
+  # @param yes      [Object, nil]  matcher (`#===`) that defines a positive
+  #   response; when `nil` the raw keypress is returned for the caller to
+  #   interpret (default: `nil`)
   # @param output   [IO]  the IO object to write the prompt and the answer to
   #
-  # @return [Object] the character entered by the user, the `default` value
-  #   if a timeout occurs, or `nil` if the read is interrupted (e.g. Ctrl-C)
+  # @return [Object, nil] see the dispatch rules above: the keypress (or
+  #   `default` on timeout / `nil` on interrupt) when `yes:` is nil, otherwise
+  #   the keypress only if it matches `yes`, else `nil`.
   def confirm?(prompt:, timeout: nil, default: nil, yes: nil, output: STDOUT)
     return default if timeout&.zero?
     if prompt.include?('%s')

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -623,6 +623,7 @@ tools:
       default: true
       require_confirmation: false
       result_display_timeout: 3
+      line_numbers: true
       allowed:
         - './tmp'
         - './lib'

data/lib/ollama_chat/rag_handling.rb

@@ -248,7 +248,7 @@ module OllamaChat::RAGHandling
             label   = source ? "#{source} #{snippet}" : snippet
             feedback(label, type: :info)
             view_tag_records(tag, [record])
-            ask?(prompt: "  [c]lear / other to go back: ") =~ /\Ac/i or next
+            confirm?(prompt: "  [c]lear / other to go back: ") =~ /\Ac/i or next
             clear_tag_records(tag, source)
           else
             group_lines = []
@@ -270,7 +270,7 @@ module OllamaChat::RAGHandling
             )
             next if chosen.nil? || chosen == '[back]'
             src, recs = group_map[chosen]
-            action = ask?(prompt: "  [v]iew / [c]lear / other to go back: ")
+            action = confirm?(prompt: "  [v]iew / [c]lear / other to go back: ")
             case action
             when /\Av/i
               view_tag_records(tag, recs)
@@ -350,11 +350,11 @@ module OllamaChat::RAGHandling
           break
         else
           source = display_map[chosen]
-          action = ask?(prompt: "  [v]iew / [c]lear / other to go back: ")
+          action = confirm?(prompt: "  [v]iew / [c]lear / other to go back: ")
           case action
           when /\Av/i
             records = @documents.records(sources: [ source ])
-            use_pager do |output|
+            use_pager(force: true) do |output|
               output.puts "#{bold{source}} (#{records.size} records)"
               output.puts
               records.each do |record|

data/lib/ollama_chat/tools/read_file.rb

@@ -28,7 +28,7 @@ class OllamaChat::Tools::ReadFile
           File reader – Returns raw text from path if it’s within allowed
           directories. No side effects; useful for inspecting config or source
           files. You can optionally specify a line range to read. You can also
-          enable prefixing with linenumbers; this is highly recommended (and
+          enable prefixing with line numbers; this is highly recommended (and
           practically mandatory) before calling `open_file_in_editor` to ensure
           the line range is precise.
         EOT
@@ -53,8 +53,8 @@ class OllamaChat::Tools::ReadFile
             line_numbers: Tool::Function::Parameters::Property.new(
               type: 'boolean',
               description: <<~EOT
-                Whether to prefix each line with its line number,
-                e.g. "666: The line content…
+                Whether to prefix each line with its line number, e.g.
+                "666: The line content…" (default: #{!!tool_config.line_numbers?})
               EOT
             )
           },
@@ -77,12 +77,12 @@ class OllamaChat::Tools::ReadFile
   # @return [String] an error message as a JSON string if the operation fails
   # @raise [JSON::ParserError] if the result cannot be serialized to JSON
   def execute(tool_call, **opts)
-
     args   = tool_call.function.arguments
 
     start_line   = args.start_line.full?
     end_line     = args.end_line.full?
     line_numbers = args.line_numbers
+    line_numbers.nil? and line_numbers = !!tool_config.line_numbers?
 
     path                = assert_valid_path(args.path, tool_config.allowed?, check: :file)
     full_content        = path.read

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.129'
+  VERSION         = '0.0.130'
   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.129 ruby lib
+# stub: ollama_chat 0.0.130 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.129".freeze
+  s.version = "0.0.130".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/spec/ollama_chat/rag_handling_spec.rb

@@ -141,7 +141,7 @@ describe OllamaChat::RAGHandling do
           with(a_string_including('hello world'), type: :info)
         buf = StringIO.new
         expect(chat).to receive(:use_pager).and_yield(buf)
-        expect(chat).to receive(:ask?).and_return('c')
+        expect(chat).to receive(:confirm?).and_return('c')
         expect(docs).to receive(:collection).at_least(:once).
           and_return('default')
         expect(docs).to receive(:clear).with(tags: [ 'mem' ])
@@ -164,7 +164,7 @@ describe OllamaChat::RAGHandling do
           with(a_string_including('hello world'), type: :info)
         buf = StringIO.new
         expect(chat).to receive(:use_pager).and_yield(buf)
-        expect(chat).to receive(:ask?).and_return('x')
+        expect(chat).to receive(:confirm?).and_return('x')
         expect(chat).to receive(:feedback).with('Exiting chooser.')
         chat.clear_collection_tags
         expect(buf.string).to include('hello world')
@@ -186,7 +186,7 @@ describe OllamaChat::RAGHandling do
           with(a_string_including('a.rb'), type: :info)
         buf = StringIO.new
         expect(chat).to receive(:use_pager).and_yield(buf)
-        expect(chat).to receive(:ask?).and_return('c')
+        expect(chat).to receive(:confirm?).and_return('c')
         expect(docs).to receive(:collection).at_least(:once).
           and_return('default')
         expect(docs).to receive(:source_remove).with('a.rb')
@@ -214,7 +214,7 @@ describe OllamaChat::RAGHandling do
           and_return('t1', 'a.rb "aaa"', '[EXIT]')
         expect(docs).to receive(:records).with(tags: 't1').
           and_return([ rec1, rec2 ])
-        expect(chat).to receive(:ask?).and_return('c')
+        expect(chat).to receive(:confirm?).and_return('c')
         expect(docs).to receive(:collection).at_least(:once).
           and_return('default')
         expect(docs).to receive(:source_remove).with('a.rb')
@@ -263,7 +263,7 @@ describe OllamaChat::RAGHandling do
       expect(docs).to receive(:records).at_least(:once).
         and_return([ rec ])
       expect(chat).to receive(:choose_entry).and_return('a.rb  [t1]', '[EXIT]')
-      expect(chat).to receive(:ask?).and_return('c')
+      expect(chat).to receive(:confirm?).and_return('c')
       expect(docs).to receive(:collection).at_least(:once).
         and_return('default')
       expect(docs).to receive(:source_remove).with('a.rb')
@@ -280,7 +280,7 @@ describe OllamaChat::RAGHandling do
       expect(docs).to receive(:records).at_least(:once).
         and_return([ rec ])
       expect(chat).to receive(:choose_entry).and_return('a.rb  [t1]', '[EXIT]')
-      expect(chat).to receive(:ask?).and_return('v')
+      expect(chat).to receive(:confirm?).and_return('v')
 
       buf = StringIO.new
       expect(chat).to receive(:use_pager).and_yield(buf)
@@ -295,7 +295,7 @@ describe OllamaChat::RAGHandling do
         and_return([ rec ])
       expect(chat).to receive(:choose_entry).
         and_return('a.rb  [t1]', '[EXIT]')
-      expect(chat).to receive(:ask?).and_return('x')
+      expect(chat).to receive(:confirm?).and_return('x')
       expect(chat).to receive(:feedback).with('Exiting chooser.')
       chat.clear_collection_sources
     end

data/spec/ollama_chat/tools/read_file_spec.rb

@@ -1,20 +1,24 @@
 describe OllamaChat::Tools::ReadFile do
-  let(:chat) do
+  let :chat do
     OllamaChat::Chat.new(argv: chat_default_config)
   end
 
+  let :tool do
+    described_class.new(chat)
+  end
+
   connect_to_ollama_server
 
   it 'can have name' do
-    expect(described_class.new(chat).name).to eq 'read_file'
+    expect(tool.name).to eq 'read_file'
   end
 
   it 'can have tool' do
-    expect(described_class.new(chat).tool).to be_a Ollama::Tool
+    expect(tool.tool).to be_a Ollama::Tool
   end
 
   it 'can be converted to hash' do
-    expect(described_class.new(chat).to_hash).to be_a Hash
+    expect(tool.to_hash).to be_a Hash
   end
 
 
@@ -32,7 +36,38 @@ describe OllamaChat::Tools::ReadFile do
       )
     )
 
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
+
+    expect(result).to be_a(String)
+    json = json_object(result)
+    expect(json.path).to include 'example.rb'
+    expect(json.content).to eq <<~EOT
+      1: puts "Hello World!"
+    EOT
+    expect(json.message).to match(/Read .+ from/)
+    expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+    expect(json.line_count).to eq 1
+    expect(json.checksum).to match(/\A[0-9a-f]{8}\z/)
+    expect(described_class.summary_template(result:))\
+      .to match(/Read .+ from/)
+  end
+
+  it 'can be executed successfully with config line_numbers false' do
+    expect(tool.expose.tool_config).to receive(:line_numbers).and_return false
+    tool_call = double(
+      'ToolCall',
+      function: double(
+        name: 'read_file',
+        arguments: double(
+          path: asset('example.rb'),
+          start_line: nil,
+          end_line: nil,
+          line_numbers: nil,
+        )
+      )
+    )
+
+    result = tool.execute(tool_call)
 
     expect(result).to be_a(String)
     json = json_object(result)
@@ -40,14 +75,15 @@ describe OllamaChat::Tools::ReadFile do
     expect(json.content).to eq <<~EOT
       puts "Hello World!"
     EOT
-    expect(json.message).to include('Read 6.0 T (20.0 B) from')
+    expect(json.message).to match(/Read .+ from/)
     expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
     expect(json.line_count).to be_nil
-    expect(json.checksum).not_to be_present
+    expect(json.checksum).not_to match(/\A[0-9a-f]{8}\z/)
     expect(described_class.summary_template(result:))\
-      .to include('Read 6.0 T (20.0 B) from')
+      .to match(/Read .+ from/)
   end
 
+
   it 'can extract range when start_line is provided and end_line is nil' do
     tool_call = double(
       'ToolCall',
@@ -61,12 +97,12 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
-    expect(json.content).to eq "puts \"Hello World!\"\n"
-    expect(json.message).to include('Read 6.0 T (20.0 B) from')
+    expect(json.content).to eq "1: puts \"Hello World!\"\n"
+    expect(json.message).to match(/Read .+ from/)
     expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
-    expect(json.line_count).to be_nil
+    expect(json.line_count).to eq 1
     expect(json.checksum).not_to be_present
   end
 
@@ -83,12 +119,12 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
-    expect(json.content).to eq "puts \"Hello World!\"\n"
-    expect(json.message).to include('Read 6.0 T (20.0 B) from')
+    expect(json.content).to eq "1: puts \"Hello World!\"\n"
+    expect(json.message).to match(/Read .+ from/)
     expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
-    expect(json.line_count).to be_nil
+    expect(json.line_count).to eq 1
     expect(json.checksum).not_to be_present
   end
 
@@ -105,7 +141,7 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
     expect(json.content).to eq ''
     expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
@@ -126,7 +162,7 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
     expect(json.content).to include("1: puts \"Hello World!\"\n")
     expect(json.line_count).to eq 1
@@ -146,7 +182,7 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
     expect(json.content).not_to include("1: ")
     expect(json.mtime).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
@@ -167,7 +203,7 @@ describe OllamaChat::Tools::ReadFile do
         )
       )
     )
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
     json = json_object(result)
     expect(json.content).to eq(<<~EOT)
       2: John Doe,32,Software Engineer
@@ -192,7 +228,7 @@ describe OllamaChat::Tools::ReadFile do
       )
     )
 
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
 
     # Should return valid JSON with error
     expect(result).to be_a(String)
@@ -219,7 +255,7 @@ describe OllamaChat::Tools::ReadFile do
       )
     )
 
-    result = described_class.new(chat).execute(tool_call)
+    result = tool.execute(tool_call)
 
     # Should return valid JSON with error
     expect(result).to be_a(String)

metadata

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