ollama_chat 0.0.95 → 0.0.97

data/spec/ollama_chat/token_estimator_spec.rb

@@ -0,0 +1,41 @@
+describe OllamaChat::TokenEstimator do
+  describe '.estimate' do
+    it 'uses crude estimation when no ollama client and model are provided' do
+      # 10 bytes / 3.5 = 2.85... -> ceil is 3
+      result = described_class.estimate('1234567890')
+      expect(result).to be_a OllamaChat::TokenEstimator::Estimate
+      expect(result.tokens).to eq 3
+    end
+  end
+
+  describe OllamaChat::TokenEstimator::Crude do
+    it 'correctly estimates tokens from a string' do
+      # 11 bytes / 3.5 = 3.14… -> ceil is 4, as legislated by the state of
+      # Indiana… probably.
+      crude = described_class.new('Hello World') # 11 bytes
+      result = crude.perform
+      expect(result.bytes).to eq 11
+      expect(result.tokens).to eq 4
+    end
+
+    it 'correctly estimates tokens from an integer byte count' do
+      # 100 bytes / 3.5 = 28.5... -> ceil is 29
+      crude = described_class.new(100)
+      result = crude.perform
+      expect(result.bytes).to eq 100
+      expect(result.tokens).to eq 29
+    end
+
+    it 'raises ArgumentError for invalid input types' do
+      expect {
+        described_class.new({ not: 'a string or int' })
+      }.to raise_error(ArgumentError, /cannot be used to estimate/)
+    end
+
+    it 'returns an Estimate object with formatted methods' do
+      result = described_class.new('Test').perform
+      expect(result).to respond_to(:bytes_formatted)
+      expect(result).to respond_to(:tokens_formatted)
+    end
+  end
+end

data/spec/ollama_chat/tools/compute_bmi_spec.rb

@@ -28,11 +28,14 @@ describe OllamaChat::Tools::ComputeBMI do
           )
         )
 
-        result = described_class.new.execute(tool_call, chat: chat)
+        result = described_class.new.execute(tool_call, chat:)
         json = json_object(result)
 
         expect(json.bmi).to be_within(0.01).of(22.86)
         expect(json.category).to eq 'Normal weight'
+        expect(json.message).to match(
+          /This BMI is 22\.8\d+, which falls into the Normal weight category\./
+        )
       end
 
       it 'calculates BMI correctly for Underweight' do
@@ -44,11 +47,14 @@ describe OllamaChat::Tools::ComputeBMI do
           )
         )
 
-        result = described_class.new.execute(tool_call, chat: chat)
+        result = described_class.new.execute(tool_call, chat:)
         json = json_object(result)
 
         expect(json.bmi).to be_within(0.01).of(17.58)
         expect(json.category).to eq 'Underweight'
+        expect(json.message).to match(
+          /This BMI is 17\.5\d+, which falls into the Underweight category\./
+        )
       end
     end
 
@@ -62,11 +68,14 @@ describe OllamaChat::Tools::ComputeBMI do
           )
         )
 
-        result = described_class.new.execute(tool_call, chat: chat)
+        result = described_class.new.execute(tool_call, chat:)
         json = json_object(result)
 
         expect(json.bmi).to be_within(0.01).of(21.52)
         expect(json.category).to eq 'Normal weight'
+        expect(json.message).to match(
+          /This BMI is 21\.5\d+, which falls into the Normal weight category\./
+        )
       end
     end
 
@@ -80,7 +89,7 @@ describe OllamaChat::Tools::ComputeBMI do
           )
         )
 
-        result = described_class.new.execute(tool_call, chat: chat)
+        result = described_class.new.execute(tool_call, chat:)
         json = json_object(result)
 
         expect(json.error).to eq 'OllamaChat::ToolFunctionArgumentError'
@@ -96,7 +105,7 @@ describe OllamaChat::Tools::ComputeBMI do
           )
         )
 
-        result = described_class.new.execute(tool_call, chat: chat)
+        result = described_class.new.execute(tool_call, chat:)
         json = json_object(result)
 
         expect(json.error).to eq 'OllamaChat::ToolFunctionArgumentError'

data/spec/ollama_chat/tools/copy_to_clipboard_spec.rb

@@ -32,7 +32,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     # Test that perform_copy_to_clipboard is called with content: true
     expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: false)
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
@@ -59,7 +59,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     # Test that perform_copy_to_clipboard is called with the custom text
     expect(chat).to receive(:perform_copy_to_clipboard).with(text:, content: true, edit: false)
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
@@ -84,7 +84,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     # Test that perform_copy_to_clipboard is called with edit: true
     expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: true)
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
@@ -110,7 +110,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     expect(chat).to receive(:perform_copy_to_clipboard).with(text:nil, content: true, edit: false).
       and_raise(OllamaChat::OllamaChatError, 'No response available to copy to the system clipboard.')
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON even with errors
     expect(result).to be_a(String)
@@ -135,7 +135,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: false).
       and_raise(RuntimeError, 'some kind of exception')
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON even with exceptions
     expect(result).to be_a(String)

data/spec/ollama_chat/tools/execute_grep_spec.rb

@@ -47,6 +47,7 @@ describe OllamaChat::Tools::ExecuteGrep do
     expect(json.cmd).to include('Hello\\ World')
     expect(json.cmd).to include('spec/assets')
     expect(json.result).to include('Hello World!')
+    expect(json.message).to match(/Found some matches for "Hello World" in ".*spec\/assets"\./)
   end
 
   it 'can be executed successfully with max_results parameter' do
@@ -78,6 +79,7 @@ describe OllamaChat::Tools::ExecuteGrep do
     expect(json.cmd).to include('grep')
     expect(json.cmd).to include(' -m 5 ')
     expect(json.result).to match(/blub class blob/)
+    expect(json.message).to match(/Found some matches for "class" in ".*spec\/assets"\./)
   end
 
   it 'can be executed successfully with max_results and ignore_case parameter' do
@@ -110,6 +112,7 @@ describe OllamaChat::Tools::ExecuteGrep do
     expect(json.cmd).to include(' -m 5 ')
     expect(json.cmd).to include(' -i ')
     expect(json.result).to match(/blub class blob/)
+    expect(json.message).to match(/Found some matches for "class" in ".*spec\/assets"\./)
   end
 
   it 'can handle execution errors gracefully' do
@@ -141,6 +144,7 @@ describe OllamaChat::Tools::ExecuteGrep do
     json = json_object(result)
     expect(json.cmd).to include('grep')
     expect(json.result).to eq ''
+    expect(json.message).to match(/No matches found for "nonexistent_pattern" in ".*spec\/assets"\./)
   end
 
   it 'can handle non-existent paths gracefully' do
@@ -171,6 +175,9 @@ describe OllamaChat::Tools::ExecuteGrep do
     expect(result).to be_a String
     json = json_object(result)
     expect(json.result).to match(%r(grep: /nonexistent/path/that/does/not/exist))
+    expect(json.message).to match(
+      %r(Found some matches for "test" in "/nonexistent/path/that/does/not/exist"\.)
+    )
   end
 
   it 'can handle thrown exceptions' do
@@ -224,6 +231,9 @@ describe OllamaChat::Tools::ExecuteGrep do
       json = json_object(result)
       expect(json.result).to include('Hello World!')
       expect(json.result).to include('example.rb')
+      expect(json.message).to match(
+        /Found some matches for "Hello World!" in ".*spec\/assets"\./
+      )
     end
   end
 end

data/spec/ollama_chat/tools/generate_image_spec.rb

@@ -35,8 +35,8 @@ describe OllamaChat::Tools::GenerateImage do
     double(
       'ToolCall',
       function: double(
-        name: 'generate_image',
-        arguments: arguments
+        name:      'generate_image',
+        arguments:
       )
     )
   end
@@ -53,7 +53,7 @@ describe OllamaChat::Tools::GenerateImage do
       )
       expect(instance).to receive(:poll_for_image).and_return('kitten_output.png')
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       expect(chat.links).to include(%r{/api/view.*filename=kitten_output.png})
 
@@ -67,7 +67,7 @@ describe OllamaChat::Tools::GenerateImage do
     it 'returns an error when prompt is missing' do
       arguments.prompt = nil
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       json = json_object(result)
       expect(json.error).to eq 'OllamaChat::ToolFunctionArgumentError'
@@ -78,7 +78,7 @@ describe OllamaChat::Tools::GenerateImage do
       # Force a config error by simulating the OllamaChat::OllamaChatError
       allow(OC::OLLAMA::CHAT::TOOLS::IMAGE_GENERATOR).to receive(:URL?).and_return(nil)
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       json = json_object(result)
       expect(json.error).to eq 'OllamaChat::ConfigMissingError'
@@ -93,7 +93,7 @@ describe OllamaChat::Tools::GenerateImage do
       )
       expect(instance).to receive(:poll_for_image).and_return(nil)
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       json = json_object(result)
       expect(json.error).to eq 'OllamaChat::OllamaChatError'
@@ -107,7 +107,7 @@ describe OllamaChat::Tools::GenerateImage do
         OpenStruct.new(prompt_id: nil)
       )
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       json = json_object(result)
       expect(json.error).to eq 'OllamaChat::OllamaChatError'
@@ -119,7 +119,7 @@ describe OllamaChat::Tools::GenerateImage do
         and_return(service_url)
       allow(instance).to receive(:post_url).and_raise(StandardError, 'Network crash')
 
-      result = instance.execute(tool_call, chat: chat)
+      result = instance.execute(tool_call, chat:)
 
       json = json_object(result)
       expect(json.error).to eq 'StandardError'

data/spec/ollama_chat/tools/generate_password_spec.rb

@@ -43,6 +43,9 @@ describe OllamaChat::Tools::GeneratePassword do
     json = json_object(result)
     expect(json.password).to be_a(String)
     expect(json.length).to eq 16
+    expect(json.message).to eq(
+      'Successfully generated a 16-character secure password using the default alphabet.'
+    )
   end
 
   it 'can be executed successfully with bits parameter' do
@@ -62,6 +65,9 @@ describe OllamaChat::Tools::GeneratePassword do
     json = json_object(result)
     expect(json.password).to be_a(String)
     expect(json.bits).to be >= 128
+    expect(json.message).to match(
+      /Successfully generated a \d+-character secure password using the default alphabet\./
+    )
   end
 
   it 'can be executed successfully with base32 alphabet type' do
@@ -82,6 +88,9 @@ describe OllamaChat::Tools::GeneratePassword do
     json = json_object(result)
     expect(json.password).to be_a(String)
     expect(json.alphabet_type).to eq 'base32'
+    expect(json.message).to match(
+      /Successfully generated a \d+-character secure password using the base32 alphabet\./
+    )
   end
 
   it 'can be executed successfully with default alphabet type' do
@@ -103,6 +112,9 @@ describe OllamaChat::Tools::GeneratePassword do
     expect(json.password).to be_a(String)
     expect(json.alphabet_type).to eq 'default'
     expect(json.symbols).to be true
+    expect(json.message).to eq(
+      'Successfully generated a 20-character secure password using the default alphabet.'
+    )
   end
 
   it 'can handle execution errors gracefully' do
@@ -121,6 +133,7 @@ describe OllamaChat::Tools::GeneratePassword do
     expect(result).to be_a(String)
     json = json_object(result)
     expect(json.error).to eq 'OllamaChat::ToolFunctionArgumentError'
+    expect(json.message).to eq 'require either bits or length of password'
   end
 
   it 'can be converted t)o hash' do

data/spec/ollama_chat/tools/get_current_weather_spec.rb

@@ -39,6 +39,10 @@ describe OllamaChat::Tools::GetCurrentWeather do
     expect(json.current_time).to match(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}[+-]\d{2}:\d{2}\z/)
     expect(json.currently.temperature).to be_within(0.01).of(7.74)
     expect(json.units).to eq "si"
+    expect(json.message).to eq(
+      "Currently 7.74°C and Clear. Today's forecast: No precipitation "\
+      "throughout the week, with highs falling to 13°C next Friday."
+    )
   end
 
   it 'can handle execution errors with structured JSON error response' do

data/spec/ollama_chat/tools/get_endoflife_spec.rb

@@ -25,7 +25,7 @@ describe OllamaChat::Tools::GetEndoflife do
       function: double(
         name: 'get_endoflife',
         arguments: double(
-          product: product
+          product:
         )
       )
     )
@@ -54,14 +54,14 @@ describe OllamaChat::Tools::GetEndoflife do
       function: double(
         name: 'get_endoflife',
         arguments: double(
-          product: product
+          product:
         )
       )
     )
 
     url = chat.config.tools.functions.get_endoflife.url
 
-    stub_request(:get, url % { product: product })
+    stub_request(:get, url % { product: })
       .to_return(status: 404, body: 'Not Found')
 
     result = described_class.new.execute(tool_call, chat:)

data/spec/ollama_chat/tools/get_rfc_spec.rb

@@ -25,7 +25,7 @@ describe OllamaChat::Tools::GetRFC do
       function: double(
         name: 'get_rfc',
         arguments: double(
-          rfc_id: rfc_id
+          rfc_id:
         )
       )
     )
@@ -53,7 +53,7 @@ describe OllamaChat::Tools::GetRFC do
       function: double(
         name: 'get_rfc',
         arguments: double(
-          rfc_id: rfc_id
+          rfc_id:
         )
       )
     )

data/spec/ollama_chat/tools/get_time_spec.rb

@@ -18,6 +18,7 @@ describe OllamaChat::Tools::GetTime do
   end
 
   it 'can be executed successfully' do
+    Time.dummy = '2011-11-11T11:11:11+0200'
     tool_call = double(
       'ToolCall',
       function: double(
@@ -34,5 +35,8 @@ describe OllamaChat::Tools::GetTime do
       /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{2}:\d{2}\z/
     )
     expect(json.weekday).to be_present
+    expect(json.message).to eq 'Good morning! It is currently 11:11 on Friday.'
+  ensure
+    Time.dummy = nil
   end
 end

data/spec/ollama_chat/tools/get_url_spec.rb

@@ -107,7 +107,7 @@ describe OllamaChat::Tools::GetURL do
       args = double(url: url, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.content).to eq('raw content')
     end
@@ -117,7 +117,7 @@ describe OllamaChat::Tools::GetURL do
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:import_source).with(source_io, URI.parse(url)).and_return('imported content')
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.content).to eq('imported content')
     end
@@ -127,7 +127,7 @@ describe OllamaChat::Tools::GetURL do
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:embed_source).with(source_io, URI.parse(url)).and_return('embedded content')
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.content).to eq('embedded content')
     end
@@ -137,7 +137,7 @@ describe OllamaChat::Tools::GetURL do
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:summarize_source).with(source_io, URI.parse(url)).and_return('summarized content')
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.content).to eq('summarized content')
     end
@@ -146,7 +146,7 @@ describe OllamaChat::Tools::GetURL do
       args = double(url: url, document_policy: 'chaos_mode')
       tool_call = double(function: double(arguments: args))
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.message).to match(/Invalid document policy "chaos_mode"/)
     end
@@ -163,7 +163,7 @@ describe OllamaChat::Tools::GetURL do
       args = double(url: url, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.message).to eq('Received requested URL successfully.')
     end
@@ -175,7 +175,7 @@ describe OllamaChat::Tools::GetURL do
       args = double(url: url, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
-      result = described_class.new.execute(tool_call, chat: chat)
+      result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.message).to match(/Cannot fetch.*with content type/)
     end

data/spec/ollama_chat/tools/paste_from_clipboard_spec.rb

@@ -32,7 +32,7 @@ describe OllamaChat::Tools::PasteFromClipboard do
     expect(chat).to receive(:perform_paste_from_clipboard).with(edit: false).
       and_return 'Hello World'
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
@@ -57,7 +57,7 @@ describe OllamaChat::Tools::PasteFromClipboard do
     expect(chat).to receive(:perform_paste_from_clipboard).with(edit: true).
       and_return 'Hello Edited World'
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
@@ -82,7 +82,7 @@ describe OllamaChat::Tools::PasteFromClipboard do
     expect(chat).to receive(:perform_paste_from_clipboard).with(edit: false).
       and_raise(OllamaChat::OllamaChatError, 'No content available to paste from the system clipboard.')
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON even with errors
     expect(result).to be_a(String)
@@ -106,7 +106,7 @@ describe OllamaChat::Tools::PasteFromClipboard do
     expect(chat).to receive(:perform_paste_from_clipboard).with(edit: false).
       and_raise(RuntimeError, 'some kind of exception')
 
-    result = described_class.new.execute(tool_call, chat: chat)
+    result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON even with exceptions
     expect(result).to be_a(String)

data/spec/ollama_chat/tools/read_file_spec.rb

@@ -38,6 +38,7 @@ describe OllamaChat::Tools::ReadFile do
     expect(json.content).to eq <<~EOT
       puts "Hello World!"
     EOT
+    expect(json.message).to include('Read 20.0 B (6.0 T) from')
   end
 
   it 'can extract range when start_line is provided and end_line is nil' do
@@ -55,6 +56,7 @@ describe OllamaChat::Tools::ReadFile do
     result = described_class.new.execute(tool_call, chat:)
     json = json_object(result)
     expect(json.content).to eq "puts \"Hello World!\"\n"
+    expect(json.message).to include('Read 20.0 B (6.0 T) from')
   end
 
   it 'can extract range when start_line is nil and end_line is provided' do
@@ -72,6 +74,7 @@ describe OllamaChat::Tools::ReadFile do
     result = described_class.new.execute(tool_call, chat:)
     json = json_object(result)
     expect(json.content).to eq "puts \"Hello World!\"\n"
+    expect(json.message).to include('Read 20.0 B (6.0 T) from')
   end
 
   it 'returns empty content when end_line is less than start_line' do

data/spec/ollama_chat/tools/retrieve_document_snippets_spec.rb

@@ -55,6 +55,8 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
       "Consider these snippets generated from retrieval when formulating your response!"
     )
     expect(json.snippets.size).to eq 1
+    expect(json.message).to include('Retrieved')
+    expect(json.message).to include('"Ruby array"')
   end
 
   it 'works with a valid query and tags' do
@@ -95,6 +97,8 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     expect(result).to be_a(String)
     json = json_object(result)
     expect(json.snippets.size).to eq 1
+    expect(json.message).to include('Retrieved')
+    expect(json.message).to include('"Ruby array"')
   end
 
   it 'switches to the specified collection and restores the original' do
@@ -117,7 +121,8 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     mock_docs = double('Documents')
     allow(chat).to receive(:documents).and_return(mock_docs)
 
-    expect(mock_docs).to receive(:collection).and_return('default_collection')
+    expect(mock_docs).to receive(:collection).and_return('default_collection').
+      at_least(:once)
     expect(mock_docs).to receive(:collection=).with('tolkien').ordered
     expect(mock_docs).to receive(:collection=).with('default_collection').ordered
 
@@ -144,6 +149,32 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     expect(json.message).to eq('Empty query')
   end
 
+  it 'returns a no-match message when no records are found' do
+    tool_call = double(
+      'ToolCall',
+      function: double(
+        name: 'retrieve_document_snippets',
+        arguments: double(
+          query: 'nonexistent',
+          tags: nil,
+          collection: nil,
+          min_similarity: nil,
+          text_size: nil,
+          text_count: nil,
+          rerank: false,
+        )
+      )
+    )
+
+    tool = described_class.new
+    expect(tool).to receive(:find_document_records).and_return([])
+
+    result = tool.execute(tool_call, chat:)
+    json = json_object(result)
+    expect(json.message).to include('No relevant snippets found')
+    expect(json.message).to include('"nonexistent"')
+  end
+
   it 'performs reranking when rerank is true' do
     tool_call = double(
       'ToolCall',
@@ -170,14 +201,15 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     expect(tool).to receive(:find_document_records).and_return(records)
 
     allow(chat).to receive(:prompt).with('rerank').and_return("template %{query} %{candidates}")
-    response_val = double('Response', response: double('FullResponse', full?: '1', response: '1'))
-    allow(chat).to receive(:generate).with(prompt: anything).and_return(response_val)
+    allow(chat).to receive(:generate).with(prompt: anything).and_return('1')
 
     result = tool.execute(tool_call, chat:)
     json = json_object(result)
 
     expect(json.snippets.size).to eq 1
     expect(json.snippets.first.text).to eq 'second'
+    expect(json.message).to include('Retrieved')
+    expect(json.message).to include('"Ruby array"')
   end
 
   it 'performs reranking when rerank is nil (defaults to true)' do
@@ -206,14 +238,15 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     expect(tool).to receive(:find_document_records).and_return(records)
 
     allow(chat).to receive(:prompt).with('rerank').and_return("template %{query} %{candidates}")
-    response_val = double('Response', response: double('FullResponse', full?: '0', response: '0'))
-    allow(chat).to receive(:generate).with(prompt: anything).and_return(response_val)
+    allow(chat).to receive(:generate).with(prompt: anything).and_return('0')
 
     result = tool.execute(tool_call, chat:)
     json = json_object(result)
 
     expect(json.snippets.size).to eq 1
     expect(json.snippets.first.text).to eq 'first'
+    expect(json.message).to include('Retrieved')
+    expect(json.message).to include('"Ruby array"')
   end
 
   it 'can be converted to hash' do

data/spec/ollama_chat/tools/roll_dice_spec.rb

@@ -43,7 +43,7 @@ describe OllamaChat::Tools::RollDice do
     expect(json.rolls).to eq [2, 5]
     expect(json.modifier).to eq 0
     expect(json.total).to eq 7
-    expect(json.message).to eq 'Dice roll was: 2d6 = (2 + 5) = 7'
+    expect(json.message).to eq 'Dice roll was: 2d6 = 2…12 = (2 + 5) = 7'
   end
 
   it 'can be executed successfully with d20 notation' do
@@ -64,7 +64,7 @@ describe OllamaChat::Tools::RollDice do
     json = json_object(result)
     expect(json.rolls).to eq [10]
     expect(json.total).to eq 10
-    expect(json.message).to eq 'Dice roll was: d20 = (10) = 10'
+    expect(json.message).to eq 'Dice roll was: d20 = 1…20 = (10) = 10'
   end
 
   it 'can be executed successfully with positive modifier' do
@@ -86,7 +86,7 @@ describe OllamaChat::Tools::RollDice do
     expect(json.rolls).to eq [15]
     expect(json.modifier).to eq 3
     expect(json.total).to eq 18
-    expect(json.message).to eq 'Dice roll was: d20+3 = (15) + 3 = 18'
+    expect(json.message).to eq 'Dice roll was: d20+3 = 4…23 = (15) + 3 = 18'
   end
 
   it 'can be executed successfully with negative modifier' do
@@ -108,7 +108,7 @@ describe OllamaChat::Tools::RollDice do
     expect(json.rolls).to eq [5]
     expect(json.modifier).to eq(-3)
     expect(json.total).to eq 2
-    expect(json.message).to eq 'Dice roll was: d20-3 = (5) - 3 = 2'
+    expect(json.message).to eq 'Dice roll was: d20-3 = -2…17 = (5) - 3 = 2'
   end
 
   it 'can handle invalid dice notation' do