ollama_chat 0.0.75 → 0.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1597a5d9efa0d021f589cd739c294a46825a4fcef81fef2c547e6201f24b8a5
-  data.tar.gz: ac9f19eaaa069ae0b5efc0dbc242cc77eeefda9229fcf0ccb136a6d9c5094054
+  metadata.gz: c2fd2a7be9e054baac6b811b1a30fff33839905d39b4784d8aba2bbd6c5f3538
+  data.tar.gz: f1ff0f8a94cc8c55f43928a7e09153a92cfa4b8b0b890f1b52a7511c7fb18195
 SHA512:
-  metadata.gz: 8d3a68f7eb97563c823f8accdfe7eb749505d9925ef28af4f9f772cd7411d73fdfb5fcf31e337f4930d861a65c3e9918f9b60e2299ca835d8f6c2ba9a573f16b
-  data.tar.gz: 1231d962eba2313ea44d2fe319a7adfb3cce35dcbe10a9909fc37be3bd27dcf9672dc65083cbe8b46cb6e04c5a10c9162586d9b45936e8a8df51eace20ca8b60
+  metadata.gz: fef0b8733d62c5769b4675f769a30cddec686806347b04325b7d0ec8d65c7e546e70d1829ebf423240c32683c07afd124770def3305556e395f174eb0a030c6e
+  data.tar.gz: e14e370d2391fa9d2e90b70831c389ff3edcd86b89f7cad55586125c12675bb65ab5b16eab14029f918c7478e54b7e31b1ede609110c64391b8a6376939620d4

data/.utilsrc

@@ -33,15 +33,25 @@ code_indexer do
   verbose false
 
   gems = %w[
+    all_images
     amatch
     base64
     bigdecimal
     complex_config
+    const_conf
+    context_spook
+    csv
     date
     documentrix
     excon
+    fileutils
+    gem_hadar
+    infobar
+    irb
     json
+    kramdown
     kramdown-ansi
+    kramdown-parser-gfm
     mize
     more_math
     ollama-ruby

data/CHANGES.md

@@ -1,7 +1,56 @@
 # Changes
 
-## 2026-03-08 v0.0.75
+## 2026-03-09 v0.0.76
+
+- Added `client:` and `current_directory:` keys to `runtime_info_values` in
+  `chat.rb`.  
+- Implemented `#client` method returning `"progname **0.0.75**"` in
+  `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.  
+- Updated default config placeholders for `%{client}` and
+  `%{current_directory}` in `default_config.yml`.  
+- Adjusted web searching logic to use `location_description?` instead of
+  deprecated methods.  
+- Removed tests that expected location‑augmented system prompts from
+  `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`.  
+- Added trailing commas to JSON objects for consistency and easier future
+  edits.  
+- Standardized error field formatting, ensuring each error block includes a
+  space after the colon and a trailing comma where appropriate.  
+- Added helper `disable_content_parsing` in `chat.rb` that sets `@parse_content
+  = false`.  
+- Refactored command handlers to call `disable_content_parsing` instead of
+  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.  
+- Improved clean flow: captured return value of `clean` and set `@parse_content
+  = 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.  
+- Added new method `reload_default_persona` that prompts for confirmation
+  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.  
+- Adjusted `/clear` command handling in the chat loop to use the returned value
+  from `clean` and only proceed when nothing is returned.  
+- Renamed local variable `runtime_info` to `runtime_info_values` in `chat.rb`
+  for clarity.  
+- Updated runtime info prompt interpolation to use `runtime_info_values`
+  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`.
 
+## 2026-03-08 v0.0.75
 
 - Added runtime reporting of tool allowed paths by introducing
   `tool_paths_allowed` method and including it in chat output, updating config

data/lib/ollama_chat/chat.rb

@@ -192,6 +192,15 @@ class OllamaChat::Chat
     @links ||= Set.new
   end
 
+  # The disable_content_parsing method turns off content parsing by setting
+  # @parse_content to false.
+  #
+  # This prevents automatic parsing of user input content during chat
+  # processing.
+  def disable_content_parsing
+    @parse_content = false
+  end
+
   # Handles user input commands and processes chat interactions.
   #
   # @param content [String] The input content to process
@@ -208,7 +217,7 @@ class OllamaChat::Chat
       copy_to_clipboard
       :next
     when %r(^/paste$)
-      @parse_content = false
+      disable_content_parsing
       paste_from_clipboard
     when %r(^/markdown$)
       markdown.toggle
@@ -238,8 +247,12 @@ class OllamaChat::Chat
       messages.show_last(n)
       :next
     when %r(^/clear(?:\s+(messages|links|history|tags|all))?$)
-      clean($1)
-      :next
+      if result = clean($1)
+        disable_content_parsing
+        content = result
+      else
+        :next
+      end
     when %r(^/clobber$)
       clean('all')
       :next
@@ -275,7 +288,7 @@ class OllamaChat::Chat
         STDOUT.puts "Not enough messages in this conversation."
         return :redo
       end
-      @parse_content = false
+      disable_content_parsing
       content
     when %r(^/collection(?:\s+(clear|change))?$)
       case $1 || 'change'
@@ -319,30 +332,30 @@ class OllamaChat::Chat
       think_loud.toggle
       :next
     when %r(^/import\s+(.+))
-      @parse_content = false
+      disable_content_parsing
       import($1) or :next
     when %r(^/summarize\s+(?:(\d+)\s+)?(.+))
-      @parse_content = false
+      disable_content_parsing
       summarize($2, words: $1) or :next
     when %r(^/embedding$)
       embedding_paused.toggle(show: false)
       embedding.show
       :next
     when %r(^/embed\s+(.+))
-      @parse_content = false
+      disable_content_parsing
       embed($1) or :next
     when %r(^/web\s+(?:(\d+)\s+)?(.+))
-      @parse_content = false
+      disable_content_parsing
       web($1, $2)
     when %r(^/input(?:\s+(.+))?$)
       arg = $1
       arg and patterns = arg.scan(/(\S+)/).flatten
-      @parse_content = false
+      disable_content_parsing
       input(patterns) or :next
     when %r(^/context(?:\s+(.+))?$)
       arg = $1
       arg and patterns = arg.scan(/(\S+)/).flatten
-      @parse_content = false
+      disable_content_parsing
       context_spook(patterns) or :next
     when %r(^/compose$)
       compose or :next
@@ -396,7 +409,7 @@ class OllamaChat::Chat
       end
       :next
     when %r(^/persona(?:\s+(add|delete|edit|file|info|list|load|play))?$)
-      @parse_content = false
+      disable_content_parsing
       case $1
       when 'add'
         if result = add_persona
@@ -453,7 +466,7 @@ class OllamaChat::Chat
       STDOUT.puts "Goodbye."
       :return
     when %r(^/help me$)
-      @parse_content = false
+      disable_content_parsing
       config.prompts.help % { commands: display_chat_help_message }
     when %r(^/)
       display_chat_help
@@ -580,9 +593,11 @@ class OllamaChat::Chat
   # @param what [ String, nil ] the type of data to clear, defaults to
   #   'messages' if nil
   def clean(what)
+    persona_profile = nil
     case what
     when 'messages', nil
       messages.clear
+      persona_profile = reload_default_persona
       STDOUT.puts "Cleared messages."
     when 'links'
       links.clear
@@ -599,11 +614,13 @@ class OllamaChat::Chat
         @documents.clear
         links.clear
         clear_history
+        persona_profile = reload_default_persona
         STDOUT.puts "Cleared messages and collection #{bold{@documents.collection}}."
       else
         STDOUT.puts 'Cancelled.'
       end
     end
+    persona_profile
   end
 
   # The interact_with_user method manages the interactive loop for user input
@@ -621,7 +638,7 @@ class OllamaChat::Chat
   def interact_with_user
     loop do
       if persona_result = setup_persona_from_opts
-        @parse_content = false
+        disable_content_parsing
         content = persona_result
       else
         @parse_content = true
@@ -629,7 +646,7 @@ class OllamaChat::Chat
         input_prompt   = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
         begin
           if content = handle_tool_call_results?
-            @parse_content = false
+            disable_content_parsing
           else
             content = enable_command_completion do
               if prefill_prompt = @prefill_prompt.full?
@@ -691,9 +708,11 @@ class OllamaChat::Chat
       end
 
       if runtime_info.on? && content
-        runtime_info = {
+        runtime_info_values = {
           languages:            config.languages * ', ',
           location:             location.on? ? location_description.inspect : 'n/a',
+          client:               ,
+          current_directory:    Pathname.pwd.expand_path.to_path.inspect,
           terminal_rows:        Tins::Terminal.rows,
           terminal_cols:        Tins::Terminal.cols,
           time:                 Time.now.iso8601,
@@ -701,7 +720,7 @@ class OllamaChat::Chat
           markdown:             markdown.on? ? 'enabled' : 'disabled',
           tool_paths_allowed:   JSON(tool_paths_allowed),
         }
-        content << config.prompts.runtime_info % runtime_info
+        content << config.prompts.runtime_info % runtime_info_values
       end
 
       messages << Ollama::Message.new(role: 'user', content:, images: @images.dup)

data/lib/ollama_chat/information.rb

@@ -55,6 +55,15 @@ module OllamaChat::Information
     end
   end
 
+  # The client method returns the application name and its current version as a
+  # single string
+  #
+  # @return [ String ] the progname followed by the OllamaChat version
+  #   separated by a space
+  def client
+    [ progname, OllamaChat::VERSION ] * ' '
+  end
+
   # The collection_stats method displays statistics about the current document
   # collection.
   #

data/lib/ollama_chat/location_handling.rb

@@ -24,6 +24,14 @@ module OllamaChat::LocationHandling
     config.prompts.location % location_data
   end
 
+  # The location_description? method returns the location description string if
+  # the location setting is enabled; otherwise it returns nil.
+  #
+  # @return [String, nil]
+  def location_description?
+    location_description if location.on?
+  end
+
   # Generates a hash containing current location data.
   #
   # This method collects and returns structured location information including

data/lib/ollama_chat/message_list.rb

@@ -1,14 +1,13 @@
 # A collection class for managing chat messages with support for system
 # prompts, paged output, and conversation history.
-
+#
 # This class provides functionality for storing, retrieving, and displaying
 # chat messages in a structured manner. It handles system prompts separately
 # from regular user and assistant messages, supports pagination for displaying
 # conversations, and offers methods for manipulating message history including
 # clearing, loading, saving, and dropping exchanges. The class integrates with
-# Kramdown::ANSI for formatted output and supports location information in
-# system messages.
-
+# Kramdown::ANSI for formatted output.
+#
 # @example Creating a new message list
 #   chat = OllamaChat::Chat.new
 #   messages = OllamaChat::MessageList.new(chat)
@@ -285,39 +284,12 @@ class OllamaChat::MessageList
   end
 
   # The to_ary method converts the message list into an array of
-  # Ollama::Message objects. If location support was enabled and the message
-  # list contains a system message, the system messages is decorated with the
-  # curent location, time, and unit preferences.
+  # Ollama::Message objects.
   #
   # @return [Array] An array of Ollama::Message objects representing the
   #   messages in the list.
   def to_ary
-    location = at_location.full?
-    add_system = !!location
-    result = @messages.map do |message|
-      if message.role == 'system' && location
-        add_system = false
-        content = message.content + "\n\n#{location}"
-        Ollama::Message.new(role: message.role, content:)
-      else
-        message
-      end
-    end
-    if add_system
-      prompt = @chat.config.system_prompts.assistant?
-      content = [ prompt, location ].compact * "\n\n"
-      message = Ollama::Message.new(role: 'system', content:)
-      result.unshift message
-    end
-    result
-  end
-
-  # The at_location method returns the location/time/units information as a
-  # string if location is enabled.
-  #
-  # @return [ String ] the location information
-  def at_location
-    @chat.location_description if @chat.location.on?
+    @messages.dup
   end
 
   private

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -46,6 +46,8 @@ prompts:
 
     - Languages the user prefers: %{languages}.
     - Location is %{location}.
+    - Current directory is %{current_directory}.
+    - Client is %{client}.
     - Terminal has %{terminal_rows} rows.
     - Terminal width is %{terminal_cols} columns. **Always** aim to stay within
       80%% of this width in your output of responses, especially when using

data/lib/ollama_chat/personae_management.rb

@@ -39,8 +39,7 @@ module OllamaChat::PersonaeManagement
   # for a provided persona option, determining the appropriate file path, and
   # playing the persona file if it exists.
   def setup_persona_from_opts
-    @persona_setup and return
-    @persona_setup = true
+    @default_persona and return
     if persona = @opts[?p].full? { Pathname.new(_1) }
       if persona.extname == '.md'
         pathname = persona
@@ -48,15 +47,28 @@ module OllamaChat::PersonaeManagement
         pathname = personae_directory + (persona.to_s + '.md')
       end
       if pathname.exist?
+        @default_persona = pathname
         play_persona_file pathname
       end
     end
+  ensure
+    @default_persona ||= :none
+  end
+
+  # Reloads the default persona file if one is set and not :none, prompting the
+  # user for confirmation before playing the persona file.
+  def reload_default_persona
+    !@default_persona || @default_persona == :none and return
+    prompt = "Reload default persona #{@default_persona.basename.sub_ext('')}? (y/n) "
+    if ask?(prompt:) =~ /\Ay/i
+      play_persona_file @default_persona
+    end
   end
 
   # Returns a sorted list of available persona file names.
   #
-  # This method scans the personae directory for Markdown files and
-  # returns their basenames sorted alphabetically.
+  # This method scans the personae directory for Markdown files and returns
+  # their basenames sorted alphabetically.
   #
   # @return [Array<String>] Sorted array of persona filenames without extension
   def available_personae

data/lib/ollama_chat/tools/copy_to_clipboard.rb

@@ -62,8 +62,8 @@ class OllamaChat::Tools::CopyToClipboard
     }.to_json
   rescue => e
     {
-      error: e.class,
-      message: e.message
+      error:   e.class,
+      message: e.message,
     }.to_json
   end
 

data/lib/ollama_chat/tools/gem_path_lookup.rb

@@ -75,24 +75,24 @@ class OllamaChat::Tools::GemPathLookup
 
     if gem_spec
       {
-        gem_name: gem_name,
-        path: gem_spec.gem_dir,
+        gem_name:,
+        path:    gem_spec.gem_dir,
         version: gem_spec.version,
-        found: true,
-        message: "Found gem '#{gem_name}' at #{gem_spec.gem_dir.inspect}"
+        found:   true,
+        message: "Found gem '#{gem_name}' at #{gem_spec.gem_dir.inspect}",
       }.to_json
     else
       {
-        gem_name: gem_name,
-        path: nil,
-        found: false,
-        message: "Gem '#{gem_name}' not found in bundle"
+        gem_name:,
+        path:    nil,
+        found:   false,
+        message: "Gem '#{gem_name}' not found in bundle",
       }.to_json
     end
   rescue => e
     {
-      error: e.class,
-      message: e.message
+      error:   e.class,
+      message: e.message,
     }.to_json
   end
 

data/lib/ollama_chat/tools/generate_password.rb

@@ -156,7 +156,7 @@ class OllamaChat::Tools::GeneratePassword
     result.to_json
   rescue => e
     {
-      error: e.class,
+      error:   e.class,
       message: e.message,
     }.to_json
   end

data/lib/ollama_chat/tools/get_endoflife.rb

@@ -63,14 +63,14 @@ class OllamaChat::Tools::GetEndoflife
         'Accept' => 'application/json',
         'User-Agent' => OllamaChat::Chat.user_agent
       },
-      debug: OC::OLLAMA::CHAT::DEBUG,
+      debug:   OC::OLLAMA::CHAT::DEBUG,
       reraise: true,
       &valid_json?
     )
   rescue => e
     {
       product:,
-      error: e.class,
+      error:   e.class,
       message: e.message,
     }.to_json
   end

data/lib/ollama_chat/tools/get_rfc.rb

@@ -61,7 +61,7 @@ class OllamaChat::Tools::GetRFC
       &:read
     )
     {
-      rfc_id:,
+      rfc_id: ,
       content:,
     }.to_json
   rescue => e

data/lib/ollama_chat/tools/insert_into_editor.rb

@@ -55,12 +55,12 @@ class OllamaChat::Tools::InsertIntoEditor
 
     {
       success: true,
-      message:
+      message: ,
     }.to_json
   rescue => e
     {
       error:   e.class.to_s,
-      message: e.message
+      message: e.message,
     }.to_json
   end
 

data/lib/ollama_chat/tools/open_file_in_editor.rb

@@ -79,16 +79,16 @@ class OllamaChat::Tools::OpenFileInEditor
     end
 
     {
-      success: true,
-      message: result_msg,
-      path: file_path,
+      success:    true,
+      message:    result_msg,
+      path:       file_path,
       start_line: start_line,
-      end_line: end_line,
+      end_line:   end_line,
     }.to_json
   rescue => e
     {
-      error: e.class,
-      message: e.message
+      error:   e.class,
+      message: e.message,
     }.to_json
   end
 

data/lib/ollama_chat/tools/paste_from_clipboard.rb

@@ -51,8 +51,8 @@ class OllamaChat::Tools::PasteFromClipboard
     }.to_json
   rescue => e
     {
-      error: e.class,
-      message: e.message
+      error:   e.class,
+      message: e.message,
     }.to_json
   end
 

data/lib/ollama_chat/tools/search_web.rb

@@ -70,7 +70,7 @@ class OllamaChat::Tools::SearchWeb
     }.to_json
   rescue => e
     {
-      error: e.class,
+      error:   e.class,
       message: e.message,
     }.to_json
   end

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat/web_searching.rb

@@ -23,7 +23,7 @@ module OllamaChat::WebSearching
   # @return [ Array<String>, nil ] an array of URLs from the search results or
   #   nil if the search engine is not implemented
   def search_web(query, n = nil)
-    l     = @messages.at_location.full? and query += " #{l}"
+    l     = location_description? and query += " #{l}"
     n     = n.to_i.clamp(1..)
     query = URI.encode_uri_component(query)
     search_command = :"search_web_with_#{search_engine}"

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.75 ruby lib
+# stub: ollama_chat 0.0.76 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.75".freeze
+  s.version = "0.0.76".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/message_list_spec.rb

@@ -277,14 +277,7 @@ describe OllamaChat::MessageList do
     expect(list.size).to eq 1
   end
 
-  it 'can determine location for system prompt' do
-    expect(chat).to receive(:location).and_return(double(on?: true))
-    expect(list.send(:at_location)).to match(
-      %r(You are at Berlin \(52.514127, 13.475211\), ))
-  end
-
   it 'can be converted int an Ollama::Message array' do
-    expect(chat).to receive(:location).and_return(double(on?: false))
     list << Ollama::Message.new(role: 'user', content: 'world')
     expect(list.to_ary.map(&:as_json)).to eq [
       Ollama::Message.new(role: 'system', content: 'hello', thinking: 'a while').as_json,
@@ -292,28 +285,6 @@ describe OllamaChat::MessageList do
     ]
   end
 
-  it 'can be converted int an Ollama::Message array with location' do
-    expect(chat).to receive(:location).and_return(double(on?: true))
-    list << Ollama::Message.new(role: 'user', content: 'world')
-    first = list.to_ary.first
-    expect(first.role).to eq 'system'
-    expect(first.content).to match(
-      %r(You are at Berlin \(52.514127, 13.475211\), ))
-  end
-
-  it 'can be converted int an Ollama::Message array with location without a system prompt' do
-    expect(chat).to receive(:location).and_return(double(on?: true))
-    list = described_class.new(chat).tap do |list|
-      list << Ollama::Message.new(role: 'user', content: 'hello')
-      list << Ollama::Message.new(role: 'assistant', content: 'world')
-    end
-    first = list.to_ary.first
-    expect(first.role).to eq 'system'
-    expect(first.content).to match(
-      %r(You are a helpful assistant.\n\nYou are at Berlin \(52.514127, 13.475211\), ))
-  end
-
-
   it 'can display messages with images' do
     expect(list.message_type([])).to eq ?📨
   end

metadata

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