ollama_chat 0.0.136 → 0.0.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22822d0b02f1f0dad3fe7e9b2902fc727a6dc2d13ffcd192da3fda3980fdefc
-  data.tar.gz: 2bb58b895a48bceefb16600def20f1ea8bb16deeeabd4a307f7fea27749a9139
+  metadata.gz: '00825774cef8e349ad7666a4e3046995bfa4803216d75fe688c8479a3bfce6c2'
+  data.tar.gz: 45f95f47c73c711686b479c49ac6fec3309fe3a68c385fb9d780e28f8f10dd13
 SHA512:
-  metadata.gz: 41e74251f4318137993e985f97beba5626b9d200b460d827ce04bddfb6dc316df6dae2d78024dd1c7d4486f3b7f4f7febd4e38d666fdf1e5f00f0e3e246b7c70
-  data.tar.gz: 1cd96acf7bca275337aaaad85c41d65c2bd75101ccfa1f0924d72eda254f4fffe04c019c9c2ee12285df6ea2e91da96cf702753059c0a7e7d7aa4bde8c13b0f4
+  metadata.gz: 157e6951f84674cae4cc74e3423f9569f6cb30efc92109d7b27538ed7424e4d938e03513b9d3d0044b233be9f74b06572218c4ab128b5881d4361424585bf285
+  data.tar.gz: 98eed217eca3fc4e396110ec20729e9e10bad64e5bf40539df1768ccd70c21ede9896855ba94a4b551ab3133c3e6020f45383de2ef59e7e9e75206c168f685d7

data/CHANGES.md

@@ -1,5 +1,44 @@
 # Changes
 
+## 2026-10-23 v0.0.137
+
+### Fixes
+
+- Fixed a double-scheme bug in `OC::URL` default generation by delegating to
+  `Ollama.base_url`, ensuring correct handling of `HOST` values that already
+  include `http://` or `https://`.
+- Prevented deletion of the `default` collection in `delete_collection`,
+  returning a warning feedback instead.
+- Reset `session.current_collection` to `'default'` when the active collection
+  is deleted.
+
+### Improvements
+
+- Ensured the `default` collection row always exists in the database by
+  unioning it with `chat.documents.collections` during `Collection.sync`.
+- Removed four vestigial `refresh_system_prompt` calls from
+  `create_collection`, `edit_collection`, `rename_collection`, and
+  `delete_collection`, as collection data no longer interpolates into the
+  system prompt.
+
+### Build & CI
+
+- Updated `ollama-ruby` dependency from **1.25** to **1.26**.
+- Updated `kramdown-ansi` dependency from **~> 0.6** to **~> 0.7**.
+- Updated `gem_hadar` development dependency from **2.20.1** to **2.21.0**.
+
+### Testing
+
+- Added specs for `delete_collection` to verify refusal to delete the `default`
+  collection, resetting `current_collection` when the active collection is
+  deleted, and leaving `current_collection` unchanged for non-active
+  collections.
+
+### Documentation
+
+- Updated YARD documentation for `refresh_system_prompt` to accurately reflect
+  the placeholders used (`persona`, `persona_name`, `runtime_info`).
+
 ## 2026-10-21 v0.0.136
 
 ### Features

data/Rakefile

@@ -39,7 +39,7 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.25'
+  dependency             'ollama-ruby',           '~> 1.26'
   dependency             'documentrix',           '>= 0.8.0'
   dependency             'unix_socks',            '>= 0.4'
   dependency             'rss',                   '~> 0.3'
@@ -47,7 +47,7 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'kramdown-ansi',         '~> 0.6'
+  dependency             'kramdown-ansi',         '~> 0.7'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.61'
   dependency             'search_ui',             '>= 0.2'

data/lib/ollama_chat/database/models/collection.rb

@@ -51,7 +51,8 @@ class OllamaChat::Database::Models::Collection < Sequel::Model(OllamaChat::DB)
   #
   # @param chat [OllamaChat::Chat] the chat instance providing the configuration
   def self.sync(chat)
-    chat.documents.collections.each do |name|
+    all_collections = (%w[ default ] + chat.documents.collections).to_set
+    all_collections.each do |name|
       where(name: name.to_s).first and next
       create(
         name:        name.to_s,

data/lib/ollama_chat/oc.rb

@@ -114,7 +114,7 @@ module OC
 
     URL = set do
       description 'Ollama base URL to connect to'
-      default     { 'http://%s' % OC::OLLAMA::HOST }
+      default     { host = OC::OLLAMA::HOST? and Ollama.base_url(host).to_s }
       sensitive   true
       decode { URI.parse(_1) if _1.present? }
       check { value.scheme =~ /\Ahttps?\z/ }

data/lib/ollama_chat/rag_handling.rb

@@ -480,7 +480,6 @@ module OllamaChat::RAGHandling
         col&.update(name: new_collection.to_s)
         log(:info, "Collection renamed", data: { old_name: current_collection, new_name: new_collection })
         feedback("Renamed current collection #{current_collection} to #{new_collection}.", type: :info)
-        refresh_system_prompt
       rescue Sequel::UniqueConstraintViolation
         feedback("Renaming to #{new_collection} failed, it already exists in database.", type: :warn)
       rescue => e
@@ -678,7 +677,6 @@ module OllamaChat::RAGHandling
       end
       feedback("Created collection '#{name}'.", type: :success)
       log(:info, "Collection created", data: { name:, description:, patterns: })
-      refresh_system_prompt
     rescue Sequel::UniqueConstraintViolation
       feedback("Collection #{name.inspect} already exists.", type: :warn)
     rescue Sequel::Error => e
@@ -737,7 +735,6 @@ module OllamaChat::RAGHandling
       end
       feedback("Updated collection '#{col.name}'.", type: :success)
       log(:info, "Collection updated", data: { name: col.name, enabled: col.enabled })
-      refresh_system_prompt
     rescue Sequel::Error => e
       feedback("Database error: #{e.message}", type: :warn)
     end
@@ -761,17 +758,31 @@ module OllamaChat::RAGHandling
           next
         end
 
+        if target_name.to_s == 'default'
+          feedback(
+            "Cannot delete #{target_name.inspect}: it is the default collection. " \
+              'Switch to another collection first.',
+            type: :warn
+          )
+          next
+        end
+
+        destroyed = false
         if confirm?(prompt: "⚠️ Are you sure you want to permanently delete #{target_name.inspect}? (y/n) ", yes: /\Ay/i)
           begin
             col.chat = self
             col.destroy
+            destroyed = true
             feedback("Deleted collection #{target_name.inspect}.", type: :success)
             log(:info, "Collection deleted", data: { name: target_name })
-            refresh_system_prompt
           rescue Sequel::Error => e
             feedback("Database error: #{e.message}", type: :warn)
           rescue => e
             feedback("Error removing from Documentrix: #{e.message}", type: :warn)
+          ensure
+            if destroyed && session.current_collection == target_name
+              session.update(current_collection: 'default')
+            end
           end
         else
           feedback("Deletion denied.", type: :denied)

data/lib/ollama_chat/system_prompt_management.rb

@@ -42,11 +42,11 @@ module OllamaChat::SystemPromptManagement
   end
 
   # Re-interpolates the current system prompt with fresh dynamic values
-  # (persona content, collection descriptions, runtime info).
+  # (persona content, persona name, runtime info).
   #
   # Call this after any operation that mutates the sources baked into
-  # the system prompt, such as creating, editing, renaming, or deleting
-  # a collection, or after a persona file has been edited on disk.
+  # the system prompt, such as switching personas or toggling runtime
+  # info.
   #
   # Safe to call when no system prompt is set; returns immediately.
   def refresh_system_prompt

data/lib/ollama_chat/version.rb

@@ -5,7 +5,7 @@
 # by hand; it is rewritten on every `rake version` invocation.
 module OllamaChat
   # The current version of the OllamaChat gem as a String.
-  VERSION         = '0.0.136'
+  VERSION         = '0.0.137'
   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.136 ruby lib
+# stub: ollama_chat 0.0.137 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.136".freeze
+  s.version = "0.0.137".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
-  s.rubygems_version = "4.0.22".freeze
+  s.rubygems_version = "4.0.23".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
   s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/asr_spec.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/collection_search_spec.rb".freeze, "spec/ollama_chat/command_concern_spec.rb".freeze, "spec/ollama_chat/commands_spec.rb".freeze, "spec/ollama_chat/compaction_spec.rb".freeze, "spec/ollama_chat/config_handling_spec.rb".freeze, "spec/ollama_chat/context_usage_spec.rb".freeze, "spec/ollama_chat/conversation_spec.rb".freeze, "spec/ollama_chat/database/models/favourite_spec.rb".freeze, "spec/ollama_chat/favourites_management_spec.rb".freeze, "spec/ollama_chat/file_editing_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/history_spec.rb".freeze, "spec/ollama_chat/http_handling_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/invidious_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/message_spec.rb".freeze, "spec/ollama_chat/model_handling/model_cache_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/personae_management_spec.rb".freeze, "spec/ollama_chat/prompt_handling_spec.rb".freeze, "spec/ollama_chat/prompt_management_spec.rb".freeze, "spec/ollama_chat/rag_handling_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/session_management_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/speaker_spec.rb".freeze, "spec/ollama_chat/state_selectors_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/system_prompt_management_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/token_estimator_spec.rb".freeze, "spec/ollama_chat/tool_call_processor_spec.rb".freeze, "spec/ollama_chat/tool_calling_spec.rb".freeze, "spec/ollama_chat/tools/browse_spec.rb".freeze, "spec/ollama_chat/tools/compute_bmi_spec.rb".freeze, "spec/ollama_chat/tools/concern_spec.rb".freeze, "spec/ollama_chat/tools/copy_to_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/delete_file_spec.rb".freeze, "spec/ollama_chat/tools/execute_grep_spec.rb".freeze, "spec/ollama_chat/tools/execute_jira_twg_spec.rb".freeze, "spec/ollama_chat/tools/execute_ri_spec.rb".freeze, "spec/ollama_chat/tools/execute_shell_spec.rb".freeze, "spec/ollama_chat/tools/forget_spec.rb".freeze, "spec/ollama_chat/tools/generate_image_spec.rb".freeze, "spec/ollama_chat/tools/generate_password_spec.rb".freeze, "spec/ollama_chat/tools/get_current_weather_spec.rb".freeze, "spec/ollama_chat/tools/get_cve_spec.rb".freeze, "spec/ollama_chat/tools/get_endoflife_spec.rb".freeze, "spec/ollama_chat/tools/get_ghr_spec.rb".freeze, "spec/ollama_chat/tools/get_jira_issue_spec.rb".freeze, "spec/ollama_chat/tools/get_location_spec.rb".freeze, "spec/ollama_chat/tools/get_rfc_spec.rb".freeze, "spec/ollama_chat/tools/get_time_spec.rb".freeze, "spec/ollama_chat/tools/get_url_spec.rb".freeze, "spec/ollama_chat/tools/list_directory_spec.rb".freeze, "spec/ollama_chat/tools/lookup_gem_path_spec.rb".freeze, "spec/ollama_chat/tools/lookup_group_spec.rb".freeze, "spec/ollama_chat/tools/memorize_spec.rb".freeze, "spec/ollama_chat/tools/move_file_spec.rb".freeze, "spec/ollama_chat/tools/open_file_in_editor_spec.rb".freeze, "spec/ollama_chat/tools/paste_from_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/paste_into_editor_spec.rb".freeze, "spec/ollama_chat/tools/patch_file_spec.rb".freeze, "spec/ollama_chat/tools/read_file_spec.rb".freeze, "spec/ollama_chat/tools/resolve_tag_spec.rb".freeze, "spec/ollama_chat/tools/roll_dice_spec.rb".freeze, "spec/ollama_chat/tools/run_tests_spec.rb".freeze, "spec/ollama_chat/tools/search_knowledge_spec.rb".freeze, "spec/ollama_chat/tools/search_web_spec.rb".freeze, "spec/ollama_chat/tools/write_file_spec.rb".freeze, "spec/ollama_chat/tts_spec.rb".freeze, "spec/ollama_chat/utils/analyze_directory_spec.rb".freeze, "spec/ollama_chat/utils/audio_player_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/excon_logger_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/log_rotation_spec.rb".freeze, "spec/ollama_chat/utils/log_viewer_spec.rb".freeze, "spec/ollama_chat/utils/ordered_queue_spec.rb".freeze, "spec/ollama_chat/utils/path_completer_spec.rb".freeze, "spec/ollama_chat/utils/png_metadata_extractor_spec.rb".freeze, "spec/ollama_chat/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.20.1".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.21.0".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.12".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.25".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.26".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.8.0".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.4".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
-  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.6".freeze])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.7".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.61".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0.2".freeze])

data/spec/ollama_chat/rag_handling_spec.rb

@@ -647,6 +647,16 @@ describe OllamaChat::RAGHandling do
       chat.delete_collection
     end
 
+    it 'refuses to delete the default collection' do
+      expect(chat).to receive(:choose_entry).
+        and_return('default', '[CANCEL]')
+      expect(chat).to receive(:feedback).
+        with(a_string_including('it is the default collection'), type: :warn)
+      expect(chat).not_to receive(:confirm?)
+
+      expect { chat.delete_collection }.not_to change { col_model.count }
+    end
+
     it 'deletes the collection when confirmed' do
       col_model.create(name: 'del', description: 'd', patterns: [])
       expect(chat).to receive(:choose_entry).and_return('del', '[CANCEL]')
@@ -672,6 +682,54 @@ describe OllamaChat::RAGHandling do
       expect { chat.delete_collection }
         .not_to change { col_model.count }
     end
+
+    context 'when the deleted collection is the active one' do
+      let :session do
+        double('Session')
+      end
+
+      before do
+        chat.instance_variable_set(:@session, session)
+      end
+
+      it 'resets current_collection to default' do
+        col_model.create(name: 'active', description: 'd', patterns: [])
+        expect(chat).to receive(:choose_entry).
+          and_return('active', '[CANCEL]')
+        expect(chat).to receive(:confirm?).and_return(true)
+
+        # after_destroy → switch_collection + documents.clear
+        expect(docs).to receive(:collection).and_return('default')
+        expect(docs).to receive(:collection=).with('active')
+        expect(docs).to receive(:clear)
+        expect(docs).to receive(:collection=).with('default')
+
+        # ensure → deleted collection was current, so reset to default
+        expect(session).to receive(:current_collection).and_return('active')
+        expect(session).to receive(:update).with(current_collection: 'default')
+
+        expect { chat.delete_collection }
+          .to change { col_model.count }.by(-1)
+      end
+
+      it 'leaves current_collection alone for a non-active collection' do
+        col_model.create(name: 'side', description: 'd', patterns: [])
+        expect(chat).to receive(:choose_entry).
+          and_return('side', '[CANCEL]')
+        expect(chat).to receive(:confirm?).and_return(true)
+
+        expect(docs).to receive(:collection).and_return('default')
+        expect(docs).to receive(:collection=).with('side')
+        expect(docs).to receive(:clear)
+        expect(docs).to receive(:collection=).with('default')
+
+        expect(session).to receive(:current_collection).and_return('default')
+        expect(session).not_to receive(:update)
+
+        expect { chat.delete_collection }
+          .to change { col_model.count }.by(-1)
+      end
+    end
   end
 
   describe '#create_memory_collection' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.136
+  version: 0.0.137
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.20.1
+        version: 2.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.20.1
+        version: 2.21.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +253,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement
@@ -920,7 +920,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.22
+rubygems_version: 4.0.23
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: