ollama_chat 0.0.104 → 0.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c49eaf9f13a4ed9059d931dca9fdde0c634280496426e0339c0e117de7b8340
-  data.tar.gz: 5bdcaa702ae84492475c6acfb3bdf9cd559aae3ac3c39ae535bd3aa6312fed03
+  metadata.gz: c735b80b131af33178cdbc883a31d6c0693371736cfc91366bcd0d9f42bf2ffb
+  data.tar.gz: 18a1019995611afe96a0fad541aad75324834ce9ac1828392b956988f7c916ff
 SHA512:
-  metadata.gz: ec2836dc21c758dd687734e921a8aadd85ca42bb2d827d6f160a690f5870294276f8dd7421699421de7231e71c697e3eace26e31606f6496aeaab8c367c32049
-  data.tar.gz: 1cc7c1bbd4dc27b28dbc5296bcd4bf7084bc0f493e2a3826cbf2623f9bd3749637729a182d8d89cc2b34c5fac71f7c80b40510f5022d9d64a8b707c6199a1398
+  metadata.gz: db82070f04d57c6679e0ec52474d26b1240b9cea164170258e34916a66097b3c6d3fac51e78a428372377fa956dc7732964387062f1c56d0f04906920e6a3e4e
+  data.tar.gz: d049ed9ba805b0d2ff670ecc7c3427f5644373fab6a8bf877b0260edadabb777354d5d118fc40534801ea023a6f52b8467b705cfa126eb70115c9b420a1710ec

data/CHANGES.md

@@ -1,5 +1,92 @@
 # Changes
 
+## 2026-08-06 v0.0.106
+
+### Added
+
+- New `/model options delete` subcommand to allow removing saved profiles.
+- Implementation of `delete_model_options_profile` in `model_handling.rb`.
+- New `/prompt rename` subcommand for prompt templates.
+- Implementation of `rename_prompt` method in `prompt_management.rb`.
+- Support for shell-style quoting for file pattern arguments using
+  `Shellwords.split`.
+
+### Changed
+
+- Tightened validation for the `/conversation` command to restrict filenames to
+  `.json` or `.jsonl` extensions.
+- Updated `options` string documentation to include the optional `FILENAME`
+  argument and added format hints to `save` and `load` subcommands.
+- Added a `suggest` parameter to `choose_profile_for_model` to allow specific
+  profiles to be inserted at the top of selection lists.
+- Updated `copy_model_options_profile` to use the source profile as the
+  suggested destination.
+- Refactored error logging in `OllamaChat::Chat` to use a standardized `log`
+  method with `:warn` level instead of direct `STDOUT.puts`.
+- Centralized pattern parsing logic by replacing `arg.scan(/(\S+)/).flatten`
+  with `extract_patterns` in `commands.rb`.
+- Updated context generation in `input_content.rb` to dynamically call
+  `to_json` or `to_toon` based on the selected format.
+
+### Fixed
+
+- Resolved a scope limitation in `Prompt#after_destroy` by replacing
+  `models::Favourite` with `OllamaChat::Database::Models::Favourite`.
+- Ensured the `default` profile remains valid by resetting it to an empty
+  options `{}` instead of deleting it during model option removal.
+
+### Refactored
+
+- Improved readability in `model_handling.rb` by wrapping long `STDOUT.puts`
+  strings.
+- Wrapped prompt operations in `switch_history(:prompt)` for improved
+  consistency.
+- Updated YARD documentation for `extract_patterns` to reflect new shell
+  semantics.
+
+## 2026-08-04 v0.0.105
+
+### New Features
+
+- **Collection Management**: Introduced the
+  `OllamaChat::Database::Models::Collection` model and a corresponding `Sequel`
+  migration for persistent storage. Added interactive CLI commands under
+  `/collection` including `new`, `edit`, `delete`, and `update all`.
+- **Model Profile Copying**: Added an `options copy` subcommand to allow users
+  to interactively copy configuration profiles between models, including
+  implementation of `copy_model_options_profile`.
+- **Interactive Prompt Contexts**: Implemented `choose_prompt_context` in
+  `prompt_management.rb`, allowing the `/prompt` command to dynamically query
+  and select contexts via a new `-c ?` flag.
+
+### Enhancements
+
+- **Model Options Matching**: Improved profile matching by replacing default
+  overwrite prompts with comprehensive checks against all saved `ModelOptions`
+  profiles using `ask_and_send(:symbolize_keys_recursive)`. Added pager display
+  for available profiles via `use_pager` and the ability to switch profiles via
+  `choose_profile_for_model`.
+- **Collection Synchronization**: Enhanced `list_collections` with descriptions
+  and paging, and implemented a `Collection.sync` method to backfill database
+  records during startup.
+- **Command Refactoring**: Renamed `show_session` to `info_session` within the
+  `Commands` module for increased verbosity when no subcommand is provided.
+
+### Bug Fixes & Maintenance
+
+- **Documentation**: 
+    - Clarified that the `checksum` for the `patch_file` tool must be an 8 hex
+      digit long CRC32.
+    - Added YARD `@!attribute` documentation for `links` and `history` in the
+      `Session` model.
+- **Code Cleanup**: 
+    - Replaced `.exists?` and `.first` dataset checks with `.present?` in
+      `model_handling.rb` and `session_management.rb`.
+    - Removed deprecated CLI flags `-c`, `-C`, `-D`, `-M`, and `-E` in favor of
+      interactive management.
+    - Added an `after_destroy` hook to the `Collection` model to purge
+      corresponding `Documentrix` vector data.
+
 ## 2026-07-31 v0.0.104
 
 ### Changed

data/README.md

@@ -83,11 +83,6 @@ Usage: ollama_chat [OPTIONS]
   -n             create a new session
   -u URL         the ollama base url, OLLAMA_URL
   -m MODEL       the ollama model to chat with, OLLAMA_CHAT_MODEL, ?selector
-  -c CHAT        a saved chat conversation to load
-  -C COLLECTION  name of the collection used in this conversation
-  -D DOCUMENT    load document and add to embeddings collection (multiple)
-  -M             use (empty) MemoryCache for this chat session
-  -E             disable embeddings for this chat session
   -S             open a socket to receive input from ollama_chat_send
   -V             display the current version number and quit
   -h             this help

data/lib/ollama_chat/chat.rb

@@ -101,7 +101,7 @@ class OllamaChat::Chat
   # @raise [RuntimeError] If the Ollama API version is less than 0.9.0, indicating
   #   incompatibility with required API features
   def initialize(argv: ARGV.dup)
-    @opts               = go 'f:u:m:c:C:D:l:nMESVh', argv
+    @opts               = go 'f:u:m:l:nSVh', argv
     @opts[?h] and exit usage
     @opts[?V] and exit version
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
@@ -112,14 +112,8 @@ class OllamaChat::Chat
     setup_switches
     setup_state_selectors(config)
     connect_ollama
-    if conversation_file = @opts[?c]
-      messages.load_conversation(conversation_file)
-    else
-      messages.read_conversation_jsonl(session.messages.to_s)
-    end
-    repair_group_uuids
-    embedding_enabled.set(config.embedding.enabled && !@opts[?E])
-    @documents            = setup_documents
+    @documents = setup_documents
+    models::Collection.sync(self)
     @cache                = setup_cache
     @images               = []
     @kramdown_ansi_styles = configure_kramdown_ansi_styles
@@ -221,7 +215,6 @@ class OllamaChat::Chat
   # @return [ Symbol ] the collection name symbol
   def initial_collection
     (
-      @opts[?C] ||
       session&.current_collection.full? ||
       config.embedding.collection.full? ||
       :default
@@ -542,7 +535,8 @@ class OllamaChat::Chat
         store_messages_in_session
       rescue Ollama::Errors::BadRequestError
         if (think? || tools_support.on?) && !retried
-          STDOUT.puts "#{bold('Error')}: in think mode/with tool support, switch both off and retry."
+          msg = "Error in think mode/with tool support, switch both off and retry."
+          log(:warn, msg, warn: true)
           sleep 1
           think_mode.selected  = 'disabled'
           tools_support.set false
@@ -639,10 +633,6 @@ class OllamaChat::Chat
         redis_url:         config.redis.documents.url?,
         debug:
       )
-
-      document_list = @opts[?D].to_a
-      add_documents_from_argv(document_list)
-      @documents
     else
       NULL
     end

data/lib/ollama_chat/commands.rb

@@ -139,12 +139,14 @@ module OllamaChat::Commands
 
   command(
     name: :model,
-    regexp: %r(^/model(?:\s+(change|options|options from session|options to session))?((?:\s+(?:-m))*)$),
-    complete: [ 'model', %w[ change options options\ from\ session options\ to\ session ] ],
+    regexp: %r(^/model(?:\s+(change|options(?: copy| delete)?|options from session|options to session))?((?:\s+(?:-m))*)$),
+    complete: [ 'model', %w[ change options options\ copy options\ delete options\ from\ session options\ to\ session ] ],
     help: <<~EOT
       🤖 Manage AI models & profiles:
          - change: Switch active model
          - options: Edit saved profile config
+         - options copy: Copy profile from another model
+         - options delete: Delete a saved profile
          - options from session: Save live → Saved
          - options to session: Apply Saved → Live
          -m interactively choose a model
@@ -167,6 +169,10 @@ module OllamaChat::Commands
     when 'options'
       profile = choose_profile_for_model(model, allow_new: true) or next :next
       edit_model_options(model, profile:)
+    when 'options copy'
+      copy_model_options_profile(model)
+    when 'options delete'
+      delete_model_options_profile(model)
     when 'options from session'
       profile = choose_profile_for_model(model) || 'default'
       copy_model_options_from_session(model, profile:)
@@ -276,7 +282,7 @@ module OllamaChat::Commands
   ) do |subcommand, opts, name|
     case subcommand
     when nil
-      show_session
+      info_session
     when 'list'
       list_sessions
     when 'new'
@@ -457,50 +463,71 @@ module OllamaChat::Commands
 
   command(
     name: :prompt,
-    regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|-e))?(\s+(?:-[ef]|-c\s+\w+))?(?:\s+([^-].*))?$),
-    complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset ] ],
+    regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|rename|-e))?(\s+(?:-[ef]|-c\s+(?:\w+|\?)))?(?:\s+([^-].*))?$),
+    complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset rename ] ],
     optional: true,
     options: '[-c CONTEXT|-e|-f]',
     help: <<~EOT,
       📝 Manage prompt templates:
          Subcommands: edit, info, add, delete, list,
-         duplicate, import, export, reset.
-         Options: -c [context], -e (edit next)
+         duplicate, import, export, reset, rename.
+         Options: -c [context]
+                     (? for interactive in /prompt),
+                  -e (edit next)
     EOT
   ) do |subcommand, opts, filename|
     opts = go_command('fc:', opts)
+    context = if subcommand.nil? || subcommand == '-e'
+                if opts[?c] == ??
+                  choose_prompt_context
+                else
+                  opts[?c] || 'prompt'
+                end
+              else
+                opts[?c] || choose_prompt_context
+              end
+    unless context
+       STDOUT.puts 'Cancelled.'
+       next :next
+    end
+
     case subcommand
     when 'add'
-      add_new_prompt(context: opts[?c])
+      add_new_prompt(context:)
     when 'delete'
-      choose_and_delete_prompt(context: opts[?c], force: opts[?f])
+      choose_and_delete_prompt(context:, force: opts[?f])
     when 'edit'
-      choose_and_edit_prompt(context: opts[?c])
+      choose_and_edit_prompt(context:)
     when 'list'
-      list_prompts(context: opts[?c])
+      list_prompts(context:)
     when 'duplicate'
-      duplicate_prompt(context: opts[?c])
+      duplicate_prompt(context:)
+    when 'rename'
+      rename_prompt(context:)
     when 'import'
-      import_prompt(filename, context: opts[?c])
+      import_prompt(filename, context:)
     when 'export'
-      export_prompt(context: opts[?c])
+      export_prompt(context:)
     when 'info'
-      info_prompt(context: opts[?c])
+      info_prompt(context:)
     when 'reset'
       if prompt = choose_prompt(
           default: true,
-          context: opts[?c],
+          context:,
           prompt: 'Which prompt needs to be restored to its origin? %s'
         )
       then
-        if reset_prompt_to_default(prompt.name, context: opts[?c])
+        if reset_prompt_to_default(prompt.name, context:)
           STDOUT.puts "Reset prompt #{bold{prompt.name}} to default."
         else
           STDOUT.puts "No default value found for prompt #{bold{prompt.name}}."
         end
       end
     when nil, '-e'
-      if prompt = choose_prompt(prompt: 'Which template shall guide the next response? %s').full?(&:to_s)
+      if prompt = choose_prompt(
+          prompt: 'Which template shall guide the next response? %s',
+          context:
+        ).full?(&:to_s)
         if subcommand
           prompt = edit_text(prompt)
           next prompt
@@ -543,12 +570,13 @@ module OllamaChat::Commands
 
   command(
     name: :conversation,
-    regexp: %r(^/conversation\s+(clean|save|load)(\s+-c)?(?:\s+([^-].*))?$),
+    regexp: %r(^/conversation\s+(clean|save|load)(\s+-c)?(?:\s+([^-].*\.jsonl?))?$),
     complete: [ 'conversation', %w[ save load clean ] ],
-    options: '[-c]',
+    options: '[-c] [FILENAME]',
     help: <<~EOT
       💾 Save/Load conversation state
          (-c to clean before saving)
+         FILENAME ends with .json or .jsonl
          Or clean inplace (removes tool content, images, and thinking)
     EOT
   ) do |subcommand,opts,path|
@@ -582,13 +610,17 @@ module OllamaChat::Commands
 
   command(
     name: :collection,
-    regexp: %r(^/collection(?:\s+(change|clear|list|rename|update))?$),
-    complete: [ 'collection', %w[ change clear list rename update ] ],
+    regexp: %r(^/collection(?:\s+(change|clear|list|rename|update(?: all)?|new|edit|delete))?$),
+    complete: [ 'collection', %w[ change clear list rename update update\ all new edit delete ] ],
     optional: true,
     help: <<~EOT
       📚 Manage RAG collections:
          - change/clear/list/rename
          - update: Re-index modified docs
+         - update all: Re-index all collections
+         - new: Interactively create a new collection
+         - edit: Interactively update an existing collection
+         - delete: Permanently remove a collection
          - (no subcommand): Show stats
     EOT
   ) do |subcommand|
@@ -601,11 +633,25 @@ module OllamaChat::Commands
       list_collections
     when 'rename'
       rename_collection(collection)
+    when 'update all'
+      results = ''
+      all_collections.pluck(:name).each do |collection|
+        STDOUT.puts "📝 Updating collection #{collection.inspect}… "
+        results << update_collection(collection) << ?\n
+        STDOUT.puts "✅ Done."
+      end
+      results.full? and next results
     when 'update'
-      if results = update_collection
+      if results = update_collection(collection)
         disable_content_parsing
         next results
       end
+    when 'new'
+      create_collection
+    when 'edit'
+      edit_collection
+    when 'delete'
+      delete_collection
     when nil
       collection_stats
     end
@@ -786,7 +832,7 @@ module OllamaChat::Commands
       if opts[?p]
         words = opts.fetch(?w, 100)
         all   = opts.fetch(?a, false)
-        arg and patterns = arg.scan(/(\S+)/).flatten
+        patterns = extract_patterns(arg)
         next provide_file_set_content(patterns, all:, skip_blank: true) { summarize(_1, words:) } || :next
       elsif arg
         words = opts.fetch(?w, 100)
@@ -800,7 +846,7 @@ module OllamaChat::Commands
       opts = go_command('pa', opts)
       if opts[?p]
         all      = opts.fetch(?a, false)
-        patterns = arg&.scan(/(\S+)/)&.flatten.full? || [ '**/*' ]
+        patterns = extract_patterns(arg).full? || [ '**/*' ]
         next context_spook(patterns, all:) || :next
       elsif arg
         next context_spook(Array(arg.to_s), all: true) || :next
@@ -822,7 +868,7 @@ module OllamaChat::Commands
         tags = opts[?t].full?(:split, ?,)
         if opts[?p]
           all = opts.fetch(?a, false)
-          arg and patterns = arg.scan(/(\S+)/).flatten
+          patterns = extract_patterns(arg)
           next provide_file_set_content(patterns, all:, skip_blank: true) { embed(_1, tags:) } || :next
         elsif arg
           next embed(arg, tags:) || :next
@@ -835,7 +881,7 @@ module OllamaChat::Commands
       opts = go_command('pae', opts)
       if opts[?p]
         all = opts.fetch(?a, false)
-        arg and patterns = arg.scan(/(\S+)/).flatten
+        patterns = extract_patterns(arg)
         read = -> pathname {
           STDOUT.puts "Reading #{pathname.to_s.inspect}."
           pathname.read
@@ -855,7 +901,7 @@ module OllamaChat::Commands
       opts = go_command('pae', opts)
       if opts[?p]
         all = opts.fetch(?a, false)
-        arg and patterns = arg.scan(/(\S+)/).flatten
+        patterns = extract_patterns(arg)
         next provide_file_set_content(patterns, all:, skip_blank: true) { import(_1) } || :next
       elsif arg
         source = arg

data/lib/ollama_chat/database/migrations/007_add_collections_table.rb

@@ -0,0 +1,12 @@
+Sequel.migration do
+  change do
+    create_table :collections do
+      primary_key :id
+      String :name, null: false, unique: true
+      Text :description, null: false
+      Text :patterns # JSON-encoded array of globs
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP, null: false
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP, null: false
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+# Represents a document collection stored in the database, allowing for
+# dynamic management of documentrix collections.
+#
+# This model stores collections with a name, description, and patterns
+# for automatic file discovery and synchronization.
+class OllamaChat::Database::Models::Collection < Sequel::Model(OllamaChat::DB)
+  include OllamaChat::Database::Duplicatable
+
+  plugin :timestamps, update_on_create: true
+  plugin :serialization, :json, :patterns
+  plugin :validation_helpers
+
+  # Validates the collection.
+  #
+  # Ensures that the `name` is present and unique.
+  def validate
+    super
+    validates_presence :name
+    validates_unique :name
+    validates_presence :description
+  end
+
+  # Sets the chat instance associated with this collection.
+  #
+  # This allows the collection to interact with the chat's document
+  # store during lifecycle events, such as cleanup upon destruction.
+  #
+  # @param chat [OllamaChat::Chat] the chat instance
+  attr_writer :chat
+
+  # Hook to clean up the corresponding Documentrix collection when
+  # the database record is destroyed.
+  #
+  # This ensures that we don't leave orphaned vector data in the
+  # Documentrix engine when the underlying collection record is removed.
+  def after_destroy
+    super
+    @chat or return
+    @chat.switch_collection(name) do
+      @chat.documents.clear
+    end
+    true
+  end
+
+  # Synchronizes the database records with the Documentrix collections.
+  #
+  # This method iterates through the configured collections in the chat's
+  # document store and ensures that every collection has a corresponding
+  # record in the database. If a collection exists in Documentrix but not
+  # in the database, a new record is created with a default description.
+  #
+  # @param chat [OllamaChat::Chat] the chat instance providing the configuration
+  def self.sync(chat)
+    chat.documents.collections.each do |name|
+      where(name: name.to_s).first and next
+      create(
+        name:        name.to_s,
+        description: "TODO: Describe collection #{name}",
+        patterns:    []
+      )
+    end
+  end
+
+  # @!attribute [v] id
+  #   @return [Integer] The primary key for the collection entry.
+  #
+  # @!attribute [v] name
+  #   @return [String] The name of the collection (matches documentrix name).
+  #
+  # @!attribute [v] description
+  #   @return [String, nil] A description of the collection.
+  #
+  # @!attribute [v] patterns
+  #   @return [Array, nil] An array of glob patterns for file discovery.
+  #
+  # @!attribute [v] created_at
+  #   @return [Time, nil] The timestamp when the collection was created.
+  #
+  # @!attribute [v] updated_at
+  #   @return [Time, nil] The timestamp of the last update to the collection.
+end

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

@@ -137,6 +137,12 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
   # @!attribute [v] messages
   #   @return [String] The full conversation history, stored in JSONL format.
   #
+  # @!attribute [v] links
+  #   @return [String] A text field storing links associated with the session.
+  #
+  # @!attribute [v] history
+  #   @return [String] A text field storing the history for the session.
+  #
   # @!attribute [v] created_at
   #   @return [Time, nil] The timestamp when the session was created.
   #

data/lib/ollama_chat/information.rb

@@ -72,6 +72,7 @@ module OllamaChat::Information
   #
   # @param output [IO] the output stream to write the message to
   def collection_stats(output: STDOUT)
+    col          = database_collection?(collection)
     length       = (Tins::Terminal.cols - 10).clamp(0..)
     wrapped_tags = Kramdown::ANSI::Width.
       wrap(@documents.tags.to_a.join(', '), length:).
@@ -79,6 +80,7 @@ module OllamaChat::Information
     output.puts <<~EOT
       Current Collection
         Name: #{bold{collection}}
+        Patterns: #{italic{col&.patterns&.join(' ')}}
         #Embeddings: #{@documents.size}
         #Tags: #{@documents.tags.size}
         Tags:
@@ -235,11 +237,6 @@ module OllamaChat::Information
         -n             create a new session
         -u URL         the ollama base url, OLLAMA_URL
         -m MODEL       the ollama chat model, OLLAMA_CHAT_MODEL, ?selector
-        -c CHAT        a saved chat conversation to load
-        -C COLLECTION  name of the collection used in this conversation
-        -D DOCUMENT    load document and add to embeddings collection (multiple)
-        -M             use (empty) MemoryCache for this chat session
-        -E             disable embeddings for this chat session
         -S             open a socket to receive input from ollama_chat_send
         -V             display the current version number and quit
         -h             this help
@@ -297,6 +294,21 @@ module OllamaChat::Information
     config.infobar.message.to_h
   end
 
+  # Retrieves a hash of collection names and their descriptions from the
+  # database.
+  #
+  # This is used to provide context to the AI model about available RAG
+  # collections.
+  #
+  # @return [Hash{String => String}] a hash mapping collection names to their
+  #   descriptions
+  def collection_descriptions
+    cols = models::Collection.select(:name, :description).order(:name)
+    cols.each_with_object({}) do |c, hash|
+      hash[c.name] = c.description
+    end
+  end
+
   # Generates a hash containing static runtime information.
   #
   # This method collects session-level constants including the user,
@@ -307,7 +319,7 @@ module OllamaChat::Information
   def static_runtime_information_values
     {
       client:               ,
-      collections:          JSON.pretty_generate(config.embedding.collection_descriptions?),
+      collections:          JSON.pretty_generate(collection_descriptions),
       current_directory:    Pathname.pwd.expand_path.to_path,
       languages:            config.languages * ', ',
       location:             location.on?.full? { location_description } || 'n/a',

data/lib/ollama_chat/input_content.rb

@@ -102,7 +102,7 @@ module OllamaChat::InputContent
             file filename.to_path
           end
         end
-      end.to_json
+      end.send("to_#{format.downcase}")
     else
       if context_filename = choose_filename('.contexts/*.rb')
         ContextSpook.generate_context(context_filename, verbose: true, format:).