ollama_chat 0.0.105 → 0.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf0c7c0df08fa3ef8a15a9c62b7e092d035924c071302a4f37e01776dec2504
-  data.tar.gz: '0996355cc3d0324936394a174aaeeee8b67b950d5306cf320fa22a70eef9ea0d'
+  metadata.gz: c735b80b131af33178cdbc883a31d6c0693371736cfc91366bcd0d9f42bf2ffb
+  data.tar.gz: 18a1019995611afe96a0fad541aad75324834ce9ac1828392b956988f7c916ff
 SHA512:
-  metadata.gz: 879adc039769558c938911909dbfdfc9625d6b4774cd398d8b39b4ebeb7055d7f7eb1fdaa1c26caf79d7fab3330c57c95b1169927e34d6909518e5f30f1c9d74
-  data.tar.gz: 7fbe2ad8b0f887cab6d83ece7efe118fd0189e1957fdbd5a40725200729b7e4d93e9c018c1a41cc8fc933dd2cee453a3a7b9090a7e647422314175d567e5496c
+  metadata.gz: db82070f04d57c6679e0ec52474d26b1240b9cea164170258e34916a66097b3c6d3fac51e78a428372377fa956dc7732964387062f1c56d0f04906920e6a3e4e
+  data.tar.gz: d049ed9ba805b0d2ff670ecc7c3427f5644373fab6a8bf877b0260edadabb777354d5d118fc40534801ea023a6f52b8467b705cfa126eb70115c9b420a1710ec

data/CHANGES.md

@@ -1,5 +1,49 @@
 # 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

data/lib/ollama_chat/chat.rb

@@ -535,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

data/lib/ollama_chat/commands.rb

@@ -139,13 +139,14 @@ module OllamaChat::Commands
 
   command(
     name: :model,
-    regexp: %r(^/model(?:\s+(change|options(?: copy)?|options from session|options to session))?((?:\s+(?:-m))*)$),
-    complete: [ 'model', %w[ change options options\ copy 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
@@ -170,6 +171,8 @@ module OllamaChat::Commands
       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:)
@@ -460,14 +463,14 @@ 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.
+         duplicate, import, export, reset, rename.
          Options: -c [context]
                      (? for interactive in /prompt),
                   -e (edit next)
@@ -499,6 +502,8 @@ module OllamaChat::Commands
       list_prompts(context:)
     when 'duplicate'
       duplicate_prompt(context:)
+    when 'rename'
+      rename_prompt(context:)
     when 'import'
       import_prompt(filename, context:)
     when 'export'
@@ -565,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|
@@ -826,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)
@@ -840,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
@@ -862,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
@@ -875,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
@@ -895,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/models/prompt.rb

@@ -52,7 +52,7 @@ class OllamaChat::Database::Models::Prompt < Sequel::Model(OllamaChat::DB)
   # database when the underlying prompt is removed.
   def after_destroy
     super
-    models::Favourite.where(context:, name:).destroy
+    OllamaChat::Database::Models::Favourite.where(context:, name:).destroy
   end
 
   # Seeds the prompt table from the provided chat configuration.

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:).

data/lib/ollama_chat/model_handling.rb

@@ -156,7 +156,8 @@ module OllamaChat::ModelHandling
     model_name      ||= @model
     model_options   = get_session_model_options
     store_model_options(model_name, model_options, profile:)
-    STDOUT.puts "Model options #{italic{profile}} for #{bold{model_name}} were copied from session model options."
+    STDOUT.puts "Model options #{italic{profile}} for #{bold{model_name}} "\
+      "were copied from session model options."
   end
 
   # Resets the session's model options to match the stored defaults for the
@@ -169,7 +170,8 @@ module OllamaChat::ModelHandling
     model_name             ||= @model
     stored_model_options   = get_stored_model_options(model_name, profile:)
     session.update(model_options: stored_model_options)
-    STDOUT.puts "Model options #{italic{profile}} of #{bold{model_name}} were copied to session model options."
+    STDOUT.puts "Model options #{italic{profile}} of #{bold{model_name}} "\
+      "were copied to session model options."
   end
 
   # Interactively copies model options from a source model/profile to the
@@ -181,7 +183,7 @@ module OllamaChat::ModelHandling
     src_model   = choose_model('', model)
     src_profile = choose_profile_for_model(src_model) || 'default'
     dst_model   = model
-    dst_profile = choose_profile_for_model(dst_model, allow_new: true) || src_profile
+    dst_profile = choose_profile_for_model(dst_model, allow_new: true, suggest: src_profile)
 
     src_opts = get_stored_model_options(src_model, profile: src_profile).full? or return
 
@@ -200,7 +202,31 @@ module OllamaChat::ModelHandling
     end
 
     store_model_options(dst_model, src_opts, profile: dst_profile)
-    STDOUT.puts "✅ Copied options from #{italic{src_model}}/#{italic{src_profile}} to #{bold{dst_model}}/#{italic{dst_profile}}."
+    STDOUT.puts "✅ Copied options from #{italic{src_model}}/#{italic{src_profile}} "\
+      "to #{bold{dst_model}}/#{italic{dst_profile}}."
+  end
+
+  # Interactively deletes a stored model options profile.
+  #
+  # If the deleted profile is the default one, it is replaced with an empty
+  # options hash `{}` to ensure the model always has a valid default profile.
+  #
+  # @param model [String] the model whose profile should be deleted
+  def delete_model_options_profile(model)
+    profile = choose_profile_for_model(model) or return
+
+    if confirm?(prompt: "🔔 Really delete profile #{bold{profile}} for #{bold{model}}? (y/n) ", yes: /\Ay/i)
+      if profile == 'default'
+        store_model_options(model, {}, profile:)
+        STDOUT.puts "Default profile #{italic{profile}} for #{bold{model}} has been reset to empty options."
+      else
+        models::ModelOptions.where(model_name: model, profile:).destroy
+        STDOUT.puts "Profile #{italic{profile}} for #{bold{model}} deleted."
+      end
+      log(:info, "Model options profile deleted", data: { model:, profile: })
+    else
+      STDOUT.puts "Cancelled."
+    end
   end
 
   # Presents an interactive list of stored configuration profiles for the
@@ -212,12 +238,14 @@ module OllamaChat::ModelHandling
   #
   # @param model_name [String] the name of the model whose profiles are to be listed
   # @return [String, nil] the selected profile name, or `nil` if none was chosen
-  def choose_profile_for_model(model_name, allow_new: false)
+  def choose_profile_for_model(model_name, allow_new: false, suggest: nil)
     profiles = models::ModelOptions.where(model_name:).order(:profile).map(&:profile)
 
     if allow_new
+      profiles.unshift(suggest) if suggest && !profiles.member?(suggest)
       profiles = [ '[EXIT]', '[NEW]' ] + profiles
     else
+      profiles.unshift(suggest) if suggest && !profiles.member?(suggest)
       profiles.size < 2 and return profiles.first
       profiles = [ '[EXIT]' ] + profiles
     end

data/lib/ollama_chat/prompt_management.rb

@@ -88,11 +88,11 @@ module OllamaChat::PromptManagement
   # Interactively prompts the user for a name and content (optionally loading
   # from a file) to create a new prompt template.
   #
-  # @return [Boolean, nil] true if the prompt was added, nil if the process was
+  # @return [self, nil] self if the prompt was added, nil if the process was
   #   cancelled
   def add_new_prompt(context: nil)
     context ||= 'prompt'
-    switch_history(:add_prompt) do
+    switch_history(:prompt) do
       name = determine_valid_new_name_for_prompt('to add', context:) or return
 
       sources       = %w[ [CLIPBOARD] [FILES] [EMPTY/MANUAL] ]
@@ -115,7 +115,7 @@ module OllamaChat::PromptManagement
       prompt_content = edit_text(content)
       store_prompt(name, prompt_content, context:)
       log(:info, "Prompt added", data: { name:, context: })
-      true
+      self
     end
   end
 
@@ -165,31 +165,75 @@ module OllamaChat::PromptManagement
   #   cancelled the operation or no prompt was selected.
   def duplicate_prompt(context: nil)
     context ||= 'prompt'
-    selected_prompt = choose_prompt(context:, prompt: 'Which prompt shall be the basis for a new one? %s') or return
-    STDOUT.puts kramdown_ansi_parse(
-      selected_prompt.to_s + "\n---"
-    )
-    name = nil
-    loop do
-      name = ask?(
-        prompt: "❓ Enter new prompt name to duplicate as, C-c ⇒ cancel: "
+    switch_history(:prompt) do
+      selected_prompt = choose_prompt(context:, prompt: 'Which prompt shall be the basis for a new one? %s') or return
+      STDOUT.puts kramdown_ansi_parse(
+        selected_prompt.to_s + "\n---"
       )
-      if name.nil?
-        STDOUT.puts "Cancelled."
-        return nil
+      name = nil
+      loop do
+        name = ask?(
+          prompt: "❓ Enter new prompt name to duplicate as, C-c ⇒ cancel: "
+        )
+        if name.nil?
+          STDOUT.puts "Cancelled."
+          return nil
+        end
+        if prompt(name, context:)
+          STDOUT.puts "Prompt named #{bold{name}} already exists."
+        else
+          break
+        end
       end
-      if prompt(name, context:)
-        STDOUT.puts "Prompt named #{bold{name}} already exists."
-      else
-        break
+      duplicated_prompt = selected_prompt.duplicate
+      duplicated_prompt.name = name
+      duplicated_prompt.metadata['default'] = false
+      duplicated_prompt.save
+      log(:info, "Prompt duplicated", data: { name:, old_name: selected_prompt.name, context: })
+      self
+    end
+  end
+
+  # Interactively selects an existing prompt and renames it.
+  #
+  # @return [self, nil] the current context on success, or nil if the user
+  #   cancelled the operation or no prompt was selected.
+  def rename_prompt(context: nil)
+    context ||= 'prompt'
+    switch_history(:prompt) do
+      selected_prompt = choose_prompt(
+        prompt: 'Which prompt would you like to rename? %s',
+        context:
+      ) or return
+
+      STDOUT.puts kramdown_ansi_parse(
+        selected_prompt.to_s + "\n---"
+      )
+
+      name = nil
+      loop do
+        name = ask?(
+          prompt: "❓ Enter new prompt name, C-c ⇒ cancel: "
+        )
+        if name.nil?
+          STDOUT.puts "Cancelled."
+          return nil
+        end
+        if name == selected_prompt.name
+          STDOUT.puts "That is the current name."
+        elsif prompt(name, context:)
+          STDOUT.puts "Prompt named #{bold{name}} already exists."
+        else
+          break
+        end
       end
+
+      old_name = selected_prompt.name
+      selected_prompt.name = name
+      selected_prompt.save
+      log(:info, "Prompt renamed", data: { old_name:, new_name: name, context: })
+      self
     end
-    duplicated_prompt = selected_prompt.duplicate
-    duplicated_prompt.name = name
-    duplicated_prompt.metadata['default'] = false
-    duplicated_prompt.save
-    log(:info, "Prompt duplicated", data: { name:, old_name: selected_prompt.name, context: })
-    self
   end
 
   # Interactively imports a prompt from a file.
@@ -366,21 +410,23 @@ module OllamaChat::PromptManagement
   #   the operation was cancelled.
   def determine_valid_new_name_for_prompt(action, context: nil)
     context ||= 'prompt'
-    prompt_name = nil
-    loop do
-      prompt_name = ask?(
-        prompt: "❓ Enter new prompt name #{action}, C-c ⇒ cancel: "
-      )
-      if prompt_name.nil?
-        STDOUT.puts "Cancelled."
-        return nil
-      end
-      if prompt(prompt_name, context:)
-        STDOUT.puts "Prompt named #{bold{prompt_name}} already exists."
-      else
-        break
+    switch_history(:prompt) do
+      prompt_name = nil
+      loop do
+        prompt_name = ask?(
+          prompt: "❓ Enter new prompt name #{action}, C-c ⇒ cancel: "
+        )
+        if prompt_name.nil?
+          STDOUT.puts "Cancelled."
+          return nil
+        end
+        if prompt(prompt_name, context:)
+          STDOUT.puts "Prompt named #{bold{prompt_name}} already exists."
+        else
+          break
+        end
       end
+      prompt_name
     end
-    prompt_name
   end
 end

data/lib/ollama_chat/rag_handling.rb

@@ -219,15 +219,16 @@ module OllamaChat::RAGHandling
     end
   end
 
-  # Extracts and normalizes file patterns from a space-separated string.
+  # Extracts and normalizes file patterns from a shell-style string.
   #
-  # Splits the input string by whitespace, strips each pattern, and expands
-  # them to absolute paths. Returns an empty array if the input is blank.
+  # Splits the input string using shell semantics, correctly handling
+  # spaces enclosed in single/double quotes or escaped with backslashes.
+  # Each resulting pattern is expanded to an absolute path.
   #
-  # @param patterns_str [String, nil] the space-separated glob patterns
+  # @param patterns_str [String, nil] the shell-style glob patterns
   # @return [Array<String>] an array of expanded absolute path patterns
   def extract_patterns(patterns_str)
-    patterns = patterns_str.full? ? patterns_str.split(/\s+/).map(&:strip) : []
+    patterns = Shellwords.split(patterns_str.to_s)
     patterns.map { File.expand_path(_1) }
   end
 

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.105'
+  VERSION         = '0.0.106'
   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.105 ruby lib
+# stub: ollama_chat 0.0.106 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.105".freeze
+  s.version = "0.0.106".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

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