ollama_chat 0.0.87 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbbefd02bdabd82fcf1b50768b9601eb5488ad957879e9d0ff343fdda695186b
-  data.tar.gz: 0732eadef93db023aa9684ff7cfcc7f6b89ac60598cc946b38aeb907d22ed8da
+  metadata.gz: f324fb61e2ee223925e1b539c1b553fa43d9ab03e94a8ef3531d16ff5937f900
+  data.tar.gz: 70955ecf696dad97193c20d14c7e2dbeaef5ce8cb9f38e121fc6c4b0672fdbce
 SHA512:
-  metadata.gz: 98616d08b76315211472dd33e25729753b5b2a0ff6f286a01f2eea886120f9399912edca2177a54774c2e51183e91ba66fbf1ff2cba08051e8e10b45a1154399
-  data.tar.gz: 30d586bd6500b2fb069534f0cffe78db58381cad3ec40bb8990f09e225aafcb466be9c89c1893f480157ffcecde31c195909e6db874f976bb41af85f1724cef3
+  metadata.gz: 5ef76c2f4b15f9d4ffbf0361a5d70b8aad0fc4207520c4984cc19b6efb98763dd18be5cc830cfaa5bfa0a0cc8c2ba91738485652f717b423e7a0bebd23756123
+  data.tar.gz: c0c924035d0d17bc1dde13c41ad2ea73d1b7868336754f2bc1085038b550dca5770c8dba1bd401e4b9e76c3104e864d54ba14a8b6a555ad076ec7302e7cf2f3d

data/CHANGES.md

@@ -1,5 +1,38 @@
 # Changes
 
+## 2026-06-03 v0.0.88
+
+### Added
+
+- Implemented a transition callback system for switches via the
+  `PerformCallbacks` module, allowing `OllamaChat::Switches::Switch` and
+  `OllamaChat::Switches::DatabaseSwitch` to trigger procs on state changes.
+- Added conditional inclusion of `runtime_info` in the system prompt based on
+  the state of `@chat.runtime_info.on?`.
+- Automated system prompt resets when toggling runtime information by adding
+  callbacks to the `@runtime_info` switch that trigger `reset_system_prompt`.
+
+### Changed
+
+- Updated `lib/ollama_chat/chat.rb` to utilize `@messages.system_name` instead
+  of `@system` within the `change_system_prompt` method.
+- Refactored file handling in `lib/ollama_chat/input_content.rb` by adding a
+  `skip_blank` parameter to `provide_file_set_content`, and updated
+  `summarize`, `embed`, and `import` commands to use `skip_blank: true`.
+- Simplified directory exclusion logic in `analyze_directory.rb` by using
+  strings and `child.basename.fnmatch?` for pattern matching instead of
+  expanded `Pathname` objects.
+- Refactored `embed` and `embed_source` in `lib/ollama_chat/source_fetching.rb`
+  using guard clauses and updated the corresponding prompt in
+  `default_config.yml`. You might need to reset the prompt for it to continue
+  working.
+- Clarified documentation for the `suffix` parameter in the
+  `directory_structure` tool, including notes on filtering by file extensions.
+
+### Fixed
+
+- Corrected control flow within the summary writing loop.
+
 ## 2026-05-28 v0.0.87
 
 ### Features

data/lib/ollama_chat/chat.rb

@@ -424,7 +424,7 @@ class OllamaChat::Chat
     when 'list'
       list_system_prompts
     when 'change'
-      change_system_prompt(@system)
+      change_system_prompt(@messages.system_name)
       @messages.show_system_prompt
     when 'duplicate'
       duplicate_system_prompt
@@ -534,6 +534,7 @@ class OllamaChat::Chat
         if summary.full?
           filename.write(summary)
           STDOUT.puts "File successfully written."
+          next :next
         else
           STDERR.puts "Nothing to summarize!"
           next :next
@@ -907,7 +908,7 @@ class OllamaChat::Chat
         words = opts.fetch(?w, 100)
         all   = opts.fetch(?a, false)
         arg and patterns = arg.scan(/(\S+)/).flatten
-        next provide_file_set_content(patterns, all:) { summarize(_1, words:) } || :next
+        next provide_file_set_content(patterns, all:, skip_blank: true) { summarize(_1, words:) } || :next
       elsif arg
         words = opts.fetch(?w, 100)
         source = arg
@@ -942,7 +943,7 @@ class OllamaChat::Chat
         if opts[?p]
           all = opts.fetch(?a, false)
           arg and patterns = arg.scan(/(\S+)/).flatten
-          next provide_file_set_content(patterns, all:) { embed(_1, tags:) } || :next
+          next provide_file_set_content(patterns, all:, skip_blank: true) { embed(_1, tags:) } || :next
         elsif arg
           next embed(arg, tags:) || :next
         else
@@ -972,7 +973,7 @@ class OllamaChat::Chat
       if opts[?p]
         all = opts.fetch(?a, false)
         arg and patterns = arg.scan(/(\S+)/).flatten
-        next provide_file_set_content(patterns, all:) { import(_1) } || :next
+        next provide_file_set_content(patterns, all:, skip_blank: true) { import(_1) } || :next
       elsif arg
         source = arg
         next import(source) || :next

data/lib/ollama_chat/input_content.rb

@@ -140,10 +140,12 @@ module OllamaChat::InputContent
   # @param patterns [Array<String>] # the glob patterns used to find files
   # @param all [TrueClass, FalseClass] whether to process all matching files
   #   or let the caller choose a subset
+  # @param skip_blank [TrueClass, FalseClass] whether to skip appending
+  #   to the result if the block returns a blank result
   #
   # @yield [filename] the block that processes each filename
   # @return [String] the concatenated result of the block applied to each file
-  def provide_file_set_content(patterns, all: false, &block)
+  def provide_file_set_content(patterns, all: false, skip_blank: false, &block)
     total = 0
     all and file_set_each(patterns, all:) { total += 1 }
     count = 0
@@ -154,7 +156,10 @@ module OllamaChat::InputContent
       else
         STDOUT.puts "Handling File (#{bold{count}}):"
       end
-      result << ("%s:\n\n%s\n\n" % [ filename, block.(filename) ])
+      block_result = block.(filename)
+      if !skip_blank || block_result.present?
+        result << ("%s:\n\n%s\n\n" % [ filename, block_result ])
+      end
     end.full?
   end
 end

data/lib/ollama_chat/message_list.rb

@@ -348,7 +348,7 @@ class OllamaChat::MessageList
     @messages.reject! { |msg| msg.role == 'system' }
     templates_values = {
       persona:      @chat.default_persona_profile,
-      runtime_info: @chat.static_runtime_information,
+      runtime_info: (@chat.static_runtime_information if @chat.runtime_info.on?),
     }
     if new_system_prompt = system.full? { _1.to_s % templates_values }
       @system = new_system_prompt

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -24,7 +24,7 @@ infobar:
       :frames: :braille181
       :message: ✓
 prompts:
-  embed: "This source has been added to or updated in collection %{collection}: %{source}"
+  embed: "This source has been added to or updated in collection \"%{collection}\"."
   summarize: |
     Generate an abstract summary of the content in this document using
     %{words} words:

data/lib/ollama_chat/source_fetching.rb

@@ -174,13 +174,6 @@ module OllamaChat::SourceFetching
   #   nil if embedding is disabled or fails
   def embed_source(source_io, source, tags: [], count: nil)
     @embedding.on? or return parse_source(source_io)
-    m = "Embedding #{italic { source_io&.content_type }} document "\
-      "#{source.to_s.inspect} in collection #{collection.to_s.inspect}."
-    if count
-      STDOUT.puts '%u. %s' % [ count, m ]
-    else
-      STDOUT.puts m
-    end
     unless @documents.source_modified?(source)
       STDOUT.puts "Source #{source.to_s.inspect} already up-to-date. => Skipping."
       return
@@ -212,6 +205,13 @@ module OllamaChat::SourceFetching
       )
     end
     inputs or return
+    m = "Embedded #{italic { source_io&.content_type }} document "\
+      "#{source.to_s.inspect} in collection #{collection.to_s.inspect}."
+    if count
+      STDOUT.puts '%u. %s' % [ count, m ]
+    else
+      STDOUT.puts m
+    end
     source = source.to_s
     command = false
     if source.start_with?(?!)
@@ -231,8 +231,7 @@ module OllamaChat::SourceFetching
   # Embeds content from the specified source.
   #
   # This method fetches content from a given source (command, URL, or file) and
-  # processes it for embedding using the embed_source method. If embedding is
-  # disabled, it falls back to generating a summary instead.
+  # processes it for embedding using the embed_source method.
   #
   # @param source [String] The source identifier which can be a command, URL,
   #   or file path
@@ -240,19 +239,14 @@ module OllamaChat::SourceFetching
   # @return [String, nil] The formatted embedding result or summary message, or
   #   nil if the operation fails
   def embed(source, tags: [])
-    if @embedding.on?
-      STDOUT.puts "Now embedding #{source.to_s.inspect} in collection #{collection.to_s.inspect}."
-      fetch_source(source) do |source_io|
-        content = parse_source(source_io)
-        content.present? or return
-        source_io.rewind
-        embed_source(source_io, source, tags:)
-      end
-      prompt(:embed).to_s % { source:, collection: collection }
-    else
-      STDOUT.puts "Embedding is off, so I will just give a small summary of this source."
-      summarize(source)
+    @embedding.on? or return
+    fetch_source(source) do |source_io|
+      content = parse_source(source_io)
+      content.present? or return
+      source_io.rewind
+      embed_source(source_io, source, tags:) or return
     end
+    prompt(:embed).to_s % { collection: collection }
   end
 
   private

data/lib/ollama_chat/switches.rb

@@ -45,6 +45,47 @@ module OllamaChat::Switches
     end
   end
 
+  # A module that intercepts switch state changes to execute registered callbacks.
+  #
+  # This module is designed to be prepended into switch classes. It captures
+  # the value before and after a change occurs, then triggers any proc
+  # associated with that specific transition in the `@callbacks` hash.
+  module PerformCallbacks
+    # Intercepts the set operation to trigger state-transition callbacks.
+    #
+    # @param a [Array] positional arguments passed to the original set method
+    # @param kw [Hash] keyword arguments passed to the original set method
+    # @return [Object] the result of the original set method
+    def set(*a, **kw)
+      before_value = value
+      result = super
+      perform_callbacks(before_value)
+      result
+    end
+
+    # Intercepts the toggle operation to trigger state-transition callbacks.
+    #
+    # @param kw [Hash] keyword arguments passed to the original toggle method
+    # @return [Object] the result of the original toggle method
+    def toggle(**kw)
+      before_value = value
+      result = super
+      perform_callbacks(before_value)
+      result
+    end
+
+    private
+
+    # Executes the callback proc associated with the current state transition.
+    #
+    # @param before_value [Boolean] the state of the switch before the change
+    # @return [self] the current instance
+    def perform_callbacks(before_value)
+      @callbacks[[ before_value, value ]]&.(before_value, value)
+      self
+    end
+  end
+
   # A switch class that manages boolean state with toggle and set functionality.
   #
   # The Switch class provides a simple way to manage boolean configuration
@@ -62,9 +103,12 @@ module OllamaChat::Switches
     #
     # @param msg [Hash{Boolean => String}] a hash containing true and false messages
     # @param value [Object] the initial state of the switch (coerced to boolean)
-    def initialize(msg:, value:)
-      @value = !!value
-      @msg   = msg
+    # @param callbacks [Hash{[Boolean, Boolean] => Proc}] optional mapping of
+    #   state transitions to callback procs. Keys are `[old_value, new_value]`.
+    def initialize(msg:, value:, callbacks: {})
+      @value     = !!value
+      @msg       = msg
+      @callbacks = callbacks.to_h
     end
 
     # @!attribute [r] value
@@ -92,6 +136,7 @@ module OllamaChat::Switches
     end
 
     include CheckSwitch
+    prepend PerformCallbacks
   end
 
   # Manages boolean configuration states that are persisted in the database.
@@ -105,10 +150,13 @@ module OllamaChat::Switches
     # @param chat [OllamaChat::Chat] the chat instance providing session access
     # @param msg [Hash{Boolean => String}] the message hash containing display messages
     # @param attribute [Symbol] the database attribute name to manage
-    def initialize(chat:, msg:, attribute:)
+    # @param callbacks [Hash{[Boolean, Boolean] => Proc}] optional mapping of
+    #   state transitions to callback procs. Keys are `[old_value, new_value]`.
+    def initialize(chat:, msg:, attribute:, callbacks: {})
       @chat      = chat
       @attribute = attribute
-      @msg      = msg
+      @msg       = msg
+      @callbacks = callbacks.to_h
     end
 
     # Returns the current value of the attribute from the session.
@@ -143,6 +191,7 @@ module OllamaChat::Switches
     end
 
     include CheckSwitch
+    prepend PerformCallbacks
   end
 
   # Manages a boolean state based on a dynamic proc evaluation.
@@ -315,12 +364,20 @@ module OllamaChat::Switches
       }
     )
 
+    reset_system_prompt = -> * {
+      messages.set_system_prompt(messages.system_name)
+    }
+
     @runtime_info = DatabaseSwitch.new(
       chat: self,
       attribute: :runtime_info_enabled,
       msg: {
         true  => "Runtime Information enabled.",
         false => "Runtime Information disabled.",
+      },
+      callbacks: {
+        [ false, true ] => reset_system_prompt,
+        [ true, false ] => reset_system_prompt,
       }
     )
 

data/lib/ollama_chat/tools/directory_structure.rb

@@ -27,7 +27,8 @@ class OllamaChat::Tools::DirectoryStructure
         name:,
         description: <<~EOT,
           Tree viewer – Returns JSON describing files/folders under path up to
-          max_depth (<= height of the tree). Handy for locating resources or
+          max_depth (<= height of the tree), optionally only files ending with
+          suffix, e. g. rb for ruby files. Handy for locating resources or
           presenting a project layout.
         EOT
         parameters: Tool::Function::Parameters.new(

data/lib/ollama_chat/utils/analyze_directory.rb

@@ -95,7 +95,7 @@ module OllamaChat::Utils::AnalyzeDirectory
   #
   # @api private
   def recurse_generate_structure(path = '.', exclude: [], suffix: nil, depth: 0)
-    exclude = Array(exclude).map { |p| Pathname.new(p).expand_path }
+    exclude = Array(exclude).map(&:to_s)
     extname = suffix&.sub(/\A(?<!.)/, ?.)
     path    = Pathname.new(path).expand_path
     entries = []
@@ -106,7 +106,7 @@ module OllamaChat::Utils::AnalyzeDirectory
       # Skip symlinks
       next if child.symlink?
       # Skip user‑excluded paths
-      next if exclude.any? { |e| child.fnmatch?(e.to_s, File::FNM_PATHNAME) }
+      next if exclude.any? { |e| child.basename.fnmatch?(e.to_s, File::FNM_PATHNAME) }
 
       if child.directory?
         entries << {

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.87'
+  VERSION         = '0.0.88'
   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.87 ruby lib
+# stub: ollama_chat 0.0.88 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.87".freeze
+  s.version = "0.0.88".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/chat_spec.rb

@@ -82,7 +82,6 @@ describe OllamaChat::Chat, protect_env: true do
     end
 
     it 'returns :next when input is "/toggle nixda"' do
-      expect_any_instance_of(OllamaChat::Switches::Switch).not_to receive(:toggle)
       expect(chat).to receive(:display_chat_help)
       expect(chat.handle_input("/toggle nixda")).to eq :next
     end

data/spec/ollama_chat/message_list_spec.rb

@@ -202,6 +202,7 @@ describe OllamaChat::MessageList do
 
     it 'can list conversations with thinking' do
       expect(chat).to receive(:system_prompt)
+      expect(chat).to receive(:runtime_info).and_return(double(on?: true))
       expect(chat).to receive(:static_runtime_information)
       expect(chat).to receive(:default_persona_profile)
       expect(chat).to receive(:markdown).
@@ -249,6 +250,7 @@ describe OllamaChat::MessageList do
     expect(list.messages.count { _1.role == 'system' }).to eq 0
     expect(chat).to receive(:default_persona_profile).and_return(nil)
     expect(chat).to receive(:system_prompt).and_return('test prompt')
+    expect(chat).to receive(:runtime_info).and_return(double(on?: true))
     expect(chat).to receive(:static_runtime_information)
     expect {
       expect(list.set_system_prompt('test_prompt')).to eq list
@@ -260,6 +262,7 @@ describe OllamaChat::MessageList do
     expect(chat).to receive(:default_persona_profile).and_return(nil).at_least(1)
     list.messages.clear
     expect(chat).to receive(:system_prompt).and_return('first prompt')
+    expect(chat).to receive(:runtime_info).and_return(double(on?: true)).at_least(1)
     expect(chat).to receive(:static_runtime_information).at_least(1)
     expect(list.messages.count { _1.role == 'system' }).to eq 0
     list.set_system_prompt('first_prompt')

data/spec/ollama_chat/source_fetching_spec.rb

@@ -31,7 +31,7 @@ describe OllamaChat::SourceFetching do
       './spec/assets/example.html'
     )
     expect(chat.embed('./spec/assets/example.html')).to eq(
-      'This source has been added to or updated in collection default: ./spec/assets/example.html'
+      'This source has been added to or updated in collection "default".'
     )
   end
 

data/spec/ollama_chat/switches_spec.rb

@@ -10,6 +10,46 @@ describe OllamaChat::Switches do
       )
     end
 
+    context 'callbacks' do
+      let(:callback_on) { double('callback_on') }
+      let(:callback_off) { double('callback_off') }
+      let :switch do
+        described_class.new(
+          value: false,
+          msg: { true => "On", false => "Off" },
+          callbacks: {
+            [false, true]  => callback_on,
+            [true, false]  => callback_off
+          }
+        )
+      end
+
+      it 'triggers the on-callback when switching from false to true' do
+        expect(callback_on).to receive(:call).with(false, true)
+        expect(callback_off).not_to receive(:call)
+        switch.set(true)
+      end
+
+      it 'triggers the off-callback when switching from true to false' do
+        expect(callback_on).to receive(:call).with(false, true)
+        switch.set(true) # Setup state to true
+        expect(callback_off).to receive(:call).with(true, false)
+        expect(callback_on).not_to receive(:call)
+        switch.set(false)
+      end
+
+      it 'does not trigger any callback when value remains the same' do
+        expect(callback_on).not_to receive(:call)
+        expect(callback_off).not_to receive(:call)
+        switch.set(false)
+      end
+
+      it 'triggers callbacks via toggle' do
+        expect(callback_on).to receive(:call).with(false, true)
+        switch.toggle
+      end
+    end
+
     context 'default to false' do
       let :config do
         double(test: false)
@@ -77,9 +117,46 @@ describe OllamaChat::Switches do
       )
     end
 
+    context 'callbacks' do
+      let(:callback_on) { double('callback_on') }
+      let(:callback_off) { double('callback_off') }
+      let :switch do
+        described_class.new(
+          chat: chat,
+          attribute: :test,
+          msg: { true => "On", false => "Off" },
+          callbacks: {
+            [false, true]  => callback_on,
+            [true, false]  => callback_off
+          }
+        )
+      end
+
+      it 'triggers the on-callback when switching from false to true' do
+        expect(session).to receive(:send).with(:test).and_return false, true, true
+        expect(session).to receive(:update).with("test": true)
+        expect(callback_on).to receive(:call).with(false, true)
+        switch.set(true)
+      end
+
+      it 'triggers the off-callback when switching from true to false' do
+        expect(session).to receive(:send).with(:test).and_return true, false, false
+        expect(session).to receive(:update).with("test": false)
+        expect(callback_off).to receive(:call).with(true, false)
+        switch.set(false)
+      end
+
+      it 'does not trigger callbacks when value remains the same' do
+        expect(session).to receive(:send).with(:test).and_return false, false
+        expect(session).to receive(:update).with("test": false)
+        expect(callback_on).not_to receive(:call)
+        switch.set(false)
+      end
+    end
+
     context 'default to false' do
       it 'can be switched on' do
-        expect(session).to receive(:send).with(:test).and_return false, true
+        expect(session).to receive(:send).with(:test).and_return false, false, true, true
         expect(session).to receive(:update).with("test": true)
         expect {
           switch.set(true)
@@ -89,7 +166,7 @@ describe OllamaChat::Switches do
       end
 
       it 'can be toggled on' do
-        expect(session).to receive(:send).with(:test).and_return false, false, true, true
+        expect(session).to receive(:send).with(:test).and_return false, false, false, true, true, true
         expect(session).to receive(:update).with("test": true)
         expect(STDOUT).to receive(:puts).with('Enabled.')
         expect {
@@ -102,7 +179,7 @@ describe OllamaChat::Switches do
 
     context 'default to true' do
       it 'can be switched on' do
-        expect(session).to receive(:send).with(:test).and_return true, false
+        expect(session).to receive(:send).with(:test).and_return true, true, false, false
         expect(session).to receive(:update).with("test": false)
         expect {
           switch.set(false)
@@ -112,7 +189,7 @@ describe OllamaChat::Switches do
       end
 
       it 'can be toggled off' do
-        expect(session).to receive(:send).with(:test).and_return true, true, false, false
+        expect(session).to receive(:send).with(:test).and_return true, true, true, false, false, false
         expect(session).to receive(:update).with("test": false)
         expect(STDOUT).to receive(:puts).with('Disabled.')
         expect {

data/spec/ollama_chat/utils/analyze_directory_spec.rb

@@ -92,7 +92,7 @@ describe OllamaChat::Utils::AnalyzeDirectory do
     after { FileUtils.remove_entry(@tmp_dir) }
 
     it 'skips directories listed in the exclude list' do
-      result = generate.call(@tmp_dir, exclude: [File.join(@tmp_dir, 'exclude_me')])
+      result = generate.call(@tmp_dir, exclude: %w[ exclude_me ])
       names  = result.map { |e| e[:name] }
 
       expect(names).not_to include('exclude_me')

metadata

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