ollama_chat 0.0.91 → 0.0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3106d416e537195c72ede3b02c74042b8425f06e53b83982937a1d8134ffe594
-  data.tar.gz: 24dd954498837dd1c81d437e5e673d90c0e9bd28130ffe9beef1ddd6fc31604a
+  metadata.gz: 65c990826623b9e3d8548c69bf01b715dd9597e451a5a4b480e4e09d48249113
+  data.tar.gz: bdf07bb49531d867d8be7b2cd8f2c5537867b9a2d297d939f123593952a77507
 SHA512:
-  metadata.gz: 91ca2b8c628de67a35ea027ac240d101cad0a283295681f012fc6716bce2e60720f36e4bb493edfff77866cda0210e28368cd7f58526afcc112a8b77ff59a59e
-  data.tar.gz: ee0fcf6b6575078fc7d3606c68640135e237374ec1673375042a4cfd8174248562431ae9da08e631f1fd4de57e73a3943e5702f1dedc02b8983a0d93165c3331
+  metadata.gz: 2ee0222c25f838f0c2436e71b9d9d8aa630fe45c58f7dc592c850e3dbe6b85ec0461883b05d735aab74c664fe8516ef13adecd33c18b0fd5b8571feba6827e65
+  data.tar.gz: a7ae3f192f4bead676495ee4053596fd5253e1394e5e2f1a5617f621d201e98d6dddd866c32b9d025a1b22cd3201fdf3be09a5399dab18c462c8bdc4d412b37f

data/CHANGES.md

@@ -1,5 +1,43 @@
 # Changes
 
+## 2026-06-19 v0.0.92
+
+### New Features
+
+- **LLM-Based Reranking**: Implemented reranking logic in the retrieval tool
+  via a new `rerank_records` method in
+  `lib/ollama_chat/tools/retrieve_document_snippets.rb`.
+    - Added a new `rerank` prompt template to `default_config.yml`.
+    - Refactored the `execute` method to utilize `flat_map` for better handling
+      of records without tags.
+- **Prompt Suggestions**: Introduced a `/prompt suggest` subcommand in
+  `OllamaChat::Commands`.
+    - Implemented `suggest_prompts` and `prepare_conversation_history` within
+      `OllamaChat::PromptManagement`.
+    - Added `coding_suggest` and `roleplaying_suggest` templates to
+      `default_config.yml`.
+
+### Improvements
+
+- **CLI User Experience**: Enhanced CLI interactions by replacing generic
+  prompts with flavorful, context-aware messages across `ModelHandling`,
+  `RAGHandling`, `StateSelectors`, `SystemPromptManagement`,
+  `PersonaeManagement`, and `PromptManagement`.
+- **Interaction Logic**: Expanded `choose_prompt` and `choose_system_prompt` to
+  support custom prompt messages and updated `choose_entry` signatures.
+- **Observability**: Added info logging for prompt, model, and generation
+  details within `Chat#generate`.
+- **Internal API**: Adjusted visibility in `lib/ollama_chat/chat.rb` and
+  `lib/ollama_chat/prompt_handling.rb` to allow tools access to core methods.
+
+### Tests
+
+- Updated `spec/ollama_chat/tools/retrieve_document_snippets_spec.rb` to cover
+  the new `rerank` parameter.
+- Updated `spec/ollama_chat/input_content_spec.rb` and
+  `spec/ollama_chat/state_selectors_spec.rb` to align with updated
+  `choose_entry` signatures.
+
 ## 2026-06-17 v0.0.91
 
 - Updated `lib/ollama_chat/commands.rb` to ensure the result of

data/lib/ollama_chat/chat.rb

@@ -228,8 +228,6 @@ class OllamaChat::Chat
     @messages.system_name
   end
 
-  private
-
   # The generate method sends a prompt to the Ollama model and returns the
   # result.
   #
@@ -238,6 +236,8 @@ class OllamaChat::Chat
   # @return [ Ollama::Response ] the response from the Ollama model
   def generate(prompt:)
     prepare_model(@model)
+    msg = "Using prompt #{prompt.inspect} for generation to #{@model.inspect}."
+    log(:info, msg)
     ollama.generate(
       model: @model,
       prompt:,
@@ -247,6 +247,8 @@ class OllamaChat::Chat
     )
   end
 
+  private
+
   # @return [Module] The module containing the database models.
   def models
     OllamaChat::Database::Models

data/lib/ollama_chat/commands.rb

@@ -163,7 +163,10 @@ module OllamaChat::Commands
     when 'info'
       info_system_prompt
     when 'reset'
-      if prompt = choose_system_prompt
+      if prompt = choose_system_prompt(
+          prompt: 'Which system law needs to be restored to its origin? '
+        )
+      then
         if reset_system_prompt_to_default(prompt.name)
           STDOUT.puts "Reset system prompt #{bold{prompt.name}} to default."
         else
@@ -405,12 +408,12 @@ module OllamaChat::Commands
 
   command(
     name: :prompt,
-    regexp: %r(^/prompt(\s+-e)?(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset))?(?:\s+(\S+))?$),
-    complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset ] ],
+    regexp: %r(^/prompt(\s+-e)?(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|suggest))?(?:\s+(\S+))?$),
+    complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset suggest ] ],
     optional: true,
     help: <<~EOT,
       Manage preset prompt templates or prefill the prompt (edit, info, add,
-      delete, list, duplicate, import, export, reset)
+      delete, list, duplicate, import, export, reset, suggest)
       Options: -e to edit the next prompt instead of prefilling
     EOT
   ) do |opts, subcommand, filename|
@@ -432,16 +435,22 @@ module OllamaChat::Commands
     when 'info'
       info_prompt
     when 'reset'
-      if prompt = choose_prompt(default: true)
+      if prompt = choose_prompt(
+          default: true,
+          prompt: 'Which prompt needs to be restored to its origin? '
+        )
+      then
         if reset_prompt_to_default(prompt.name)
           STDOUT.puts "Reset prompt #{bold{prompt.name}} to default."
         else
           STDOUT.puts "No default value found for prompt #{bold{prompt.name}}."
         end
       end
+    when 'suggest'
+      prompt = suggest_prompts and next prompt
     when nil
       opts = go_command('e', opts)
-      if prompt = choose_prompt.full?(&:to_s)
+      if prompt = choose_prompt(prompt: 'Which template shall guide the next response? ').full?(&:to_s)
         if opts[?e]
           prompt = edit_text(prompt)
           next prompt

data/lib/ollama_chat/favourites_management.rb

@@ -51,7 +51,7 @@ module OllamaChat::FavouritesManagement
           return
         end
         to_select.unshift('[EXIT]')
-        case chosen = choose_entry(to_select)
+        case chosen = choose_entry(to_select, prompt: 'Select an item to mark as favourite: ')
         when '[EXIT]', nil
           STDOUT.puts "Cancelled."
           return
@@ -77,7 +77,7 @@ module OllamaChat::FavouritesManagement
         to_select = models::Favourite.where(context: type).map(&:name)
         to_select = all_things.select { to_select.member?(_1.value) }
         to_select = [ '[EXIT]' ] + to_select
-        case chosen = choose_entry(to_select)
+        case chosen = choose_entry(to_select, prompt: 'Select a favourite to remove: ')
         when '[EXIT]', nil
           STDOUT.puts "Cancelled."
           return

data/lib/ollama_chat/input_content.rb

@@ -55,7 +55,7 @@ module OllamaChat::InputContent
     files = patterns.flat_map { Pathname.glob(_1) }
     files = files.reject { chosen&.member?(_1.expand_path) }.select { _1.file? }
     files.unshift('[EXIT]')
-    case chosen_file = choose_entry(files)
+    case chosen_file = choose_entry(files, prompt: 'Select a file to import: ')
     when '[EXIT]', nil
       STDOUT.puts "Exiting chooser."
       return

data/lib/ollama_chat/model_handling.rb

@@ -364,7 +364,10 @@ module OllamaChat::ModelHandling
       if models.size == 1
         models.first.value
       elsif cli_model == ''
-        choose_entry(models)&.value || current_model
+        choose_entry(
+          models,
+          prompt: "Which digital oracle shall we consult?"
+        )&.value || current_model
       else
         cli_model || current_model
       end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -24,7 +24,15 @@ infobar:
       :frames: :braille181
       :message: ✓
 prompts:
-  embed: "This source has been added to or updated in collection \"%{collection}\"."
+  embed: This source has been added to or updated in collection "%{collection}".
+  rerank: |
+    Query: %{query}
+    Candidates:
+
+      %{candidates}
+
+    Return only the indices of the most relevant snippets as a comma-separated
+    list (e.g., '0,2').
   summarize: |
     Generate an abstract summary of the content in this document using
     %{words} words:
@@ -158,7 +166,39 @@ prompts:
     Response content was
 
     %{message_content}
-  session_title: "Create a title with a length of **less than %{length}** characters for this conversation. Output only the title and nothing else:\n\n%{content}"
+  session_title: |
+    Create a title with a length of **less than %{length}** characters for this
+    conversation. Output only the title and nothing else:
+
+    %{content}
+  suggest_coding: |
+    Analyze the conversation history above. Generate exactly 3 distinct,
+    concise follow-up prompts that the user might want to ask next to further
+    their goal. 
+
+    Criteria:
+    1. One prompt should dive deeper into the current technical implementation.
+    2. One prompt should challenge a potential edge case or optimization.
+    3. One prompt should suggest a logical next step or a broader architectural question.
+
+    Output only the text of these suggestions, separated by an empty line, 
+    without any numbering, bullet points, or introductory text.
+  suggest_roleplaying: |
+    Analyze the conversation history and the current narrative state of this
+    roleplay/story. Generate exactly 3 distinct, concise prompts that the
+    user could use to respond as their character.
+
+    Criteria:
+    1. One prompt should be an active choice or bold action that pushes the
+       plot forward or creates tension.
+    2. One prompt should focus on character interaction, exploring emotional
+       depth, a social reaction, or a subtle nuance in dialogue.
+    3. One prompt should introduce a sudden complication, a risky gamble, or an
+       unexpected event. This prompt MUST explicitly include a suggested dice roll
+       (e.g., "Roll 1d20") to determine the success or failure of the action.
+
+    Output only the text of these suggestions, separated by an empty line, 
+    without any numbering, bullet points, or introductory text.
 system_prompts:
   default: <%= OC::OLLAMA::CHAT::SYSTEM || "%{persona}\n\n%{runtime_info}".inspect %>
   persona: |

data/lib/ollama_chat/personae_management.rb

@@ -91,7 +91,7 @@ module OllamaChat::PersonaeManagement
   # @return [String, nil] The name of the persona that was set as default,
   #   or nil if the selection was cancelled or no persona was chosen.
   def set_default_persona
-    if persona = choose_persona(none: true)
+    if persona = choose_persona(none: true, prompt: 'Who would you like to talk to today? ')
       set_default_persona_name(persona)
     end
   end
@@ -214,7 +214,7 @@ module OllamaChat::PersonaeManagement
   # @return [String] A JSON object with deletion status on success,
   #   or nil if persona was not selected or deletion was cancelled
   def delete_persona
-    if persona = choose_persona
+    if persona = choose_persona(prompt: 'Which persona is no longer needed? ')
       pathname        = persona_name_to_pathname(persona)
       backup_pathname = persona_backup_pathname(persona)
       if pathname.exist?
@@ -245,7 +245,7 @@ module OllamaChat::PersonaeManagement
   #
   # @return [String, nil] persona name or nil if cancelled
   def edit_persona
-    if persona = choose_persona
+    if persona = choose_persona(prompt: 'Which persona needs some polishing? ')
       pathname = persona_name_to_pathname(persona)
       old_content = pathname.read
       if edit_file(pathname)
@@ -265,7 +265,7 @@ module OllamaChat::PersonaeManagement
   # @return [String, nil] the filesystem path of the selected persona,
   #   or nil if the selection was cancelled.
   def select_persona_path
-    persona = choose_persona or return
+    persona = choose_persona(prompt: "Which persona's path do you need? ") or return
     path = persona_name_to_pathname(persona).to_s
     perform_copy_to_clipboard(text: path, edit: false)
     @prefill_prompt = path
@@ -279,7 +279,7 @@ module OllamaChat::PersonaeManagement
   # location using `File.write`. This ensures a safe copy is preserved before
   # any modifications are made to the original file.
   def backup_persona
-    if persona = choose_persona
+    if persona = choose_persona(prompt: 'Which persona should be safely archived? ')
       pathname        = persona_name_to_pathname(persona)
       old_content     = pathname.read
       backup_pathname = persona_backup_pathname(persona)
@@ -317,7 +317,7 @@ module OllamaChat::PersonaeManagement
   #
   # Shows the persona's profile using kramdown formatting with ansi parsing.
   def info_persona
-    if persona = choose_persona
+    if persona = choose_persona(prompt: 'Who would you like to learn more about? ')
       description = persona_description(persona) or return
       use_pager do |output|
         output.puts kramdown_ansi_parse(description)
@@ -374,9 +374,11 @@ module OllamaChat::PersonaeManagement
   #
   # @param chosen [Set, nil] Optional set of already selected personas
   # @param none [Boolean] whether to include a '[NONE]' option in the list
+  # @param prompt [String] the prompt message to display when asking for input
+  #   (default: 'Select a persona: ')
   # @return [String, Symbol, nil] The selected persona name, :none, or nil if
   #   user exits
-  def choose_persona(chosen: nil, none: false)
+  def choose_persona(chosen: nil, none: false, prompt: 'Select a persona: ')
     personae_list = available_personae_names.
       reject { chosen&.member?(_1) }
     if personae_list.empty?
@@ -385,7 +387,7 @@ module OllamaChat::PersonaeManagement
     end
     personae_list.unshift('[NONE]') if none
     personae_list.unshift('[EXIT]')
-    case persona = choose_entry(personae_list)
+    case persona = choose_entry(personae_list, prompt:)
     when '[EXIT]', nil
       STDOUT.puts "Exiting chooser."
       return
@@ -403,7 +405,7 @@ module OllamaChat::PersonaeManagement
   def load_personae
     chosen = Set[]
     choose_with_state do
-      while persona = choose_persona(chosen: chosen)
+      while persona = choose_persona(chosen: chosen, prompt: 'Who else should join the conversation? ')
         persona == :none and next
         chosen << persona
       end
@@ -532,7 +534,7 @@ module OllamaChat::PersonaeManagement
   # @return [self, nil] returns self on success, or nil if the operation was
   #   cancelled during persona selection or name entry.
   def duplicate_persona
-    persona          = choose_persona or return
+    persona          = choose_persona(prompt: 'Which persona shall serve as the blueprint? ') or return
     pathname         = persona_name_to_pathname(persona)
     new_persona_name = determine_valid_new_name_for_persona('to ducplicate as') or return
     new_pathname     = persona_name_to_pathname(new_persona_name)
@@ -584,7 +586,7 @@ module OllamaChat::PersonaeManagement
   # @return [self, nil] returns self if the export was successful, or nil if
   #   the process was cancelled during persona selection or filename entry.
   def export_persona
-    persona  = choose_persona or return
+    persona  = choose_persona(prompt: 'Which persona are you taking with you? ') or return
     pathname = persona_name_to_pathname(persona)
     content  = pathname.read
     STDOUT.puts kramdown_ansi_parse(

data/lib/ollama_chat/prompt_handling.rb

@@ -14,8 +14,6 @@ module OllamaChat::PromptHandling
     models::Prompt.where(context: 'system_prompt', name: name.to_s).first
   end
 
-  private
-
   # Retrieves a specific prompt by name from the 'prompt' context.
   #
   # @param name [String, Symbol] the name of the prompt to retrieve
@@ -25,6 +23,8 @@ module OllamaChat::PromptHandling
     models::Prompt.where(context: 'prompt', name: name.to_s).first
   end
 
+  private
+
   # Iterates over all prompts in the 'prompt' context.
   #
   # @yield [prompt] yields each prompt model instance

data/lib/ollama_chat/prompt_management.rb

@@ -26,13 +26,14 @@ module OllamaChat::PromptManagement
   #
   # @param default [Boolean, nil] filter for default prompts (true: only
   #   defaults, false: only non-defaults)
+  # @param prompt [String] the prompt message to display when asking for input
   #
   # @return [OllamaChat::Database::Models::Prompt, nil] the selected prompt
   #   model, or nil if the user chooses '[EXIT]' or cancels the selection.
-  def choose_prompt(default: nil)
+  def choose_prompt(default: nil, prompt: 'Select a prompt template: ')
     prompts = all_prompts(default: default)
     prompts.unshift('[EXIT]')
-    case chosen = choose_entry(prompts)
+    case chosen = choose_entry(prompts, prompt:)
     when '[EXIT]', nil
       STDOUT.puts "Exiting chooser."
       return
@@ -45,7 +46,7 @@ module OllamaChat::PromptManagement
   #
   # @return [self, nil] the current context on success, or nil if cancelled
   def info_prompt
-    if prompt = choose_prompt
+    if prompt = choose_prompt(prompt: 'Which blueprint would you like to inspect? ')
       use_pager do |output|
         output.puts kramdown_ansi_parse(<<~EOT)
           # Prompt #{prompt.name}
@@ -98,7 +99,7 @@ module OllamaChat::PromptManagement
   # Interactively selects an existing non-default prompt and deletes it after
   # confirmation.
   def choose_and_delete_prompt
-    prompt = choose_prompt(default: false) or return
+    prompt = choose_prompt(default: false, prompt: 'Which template has outlived its usefulness? ') or return
     STDOUT.puts kramdown_ansi_parse(
       prompt.to_s + "\n---"
     )
@@ -114,7 +115,7 @@ module OllamaChat::PromptManagement
   #
   # @return [self, nil] the current context on success, or nil if cancelled
   def choose_and_edit_prompt
-    prompt = choose_prompt or return
+    prompt = choose_prompt(prompt: 'Which spell needs some fine-tuning? ') or return
     prompt.metadata['content'] = edit_text(prompt.metadata['content'].to_s)
     prompt.save
     self
@@ -132,7 +133,7 @@ module OllamaChat::PromptManagement
   # @return [self, nil] the current context on success, or nil if the user
   #   cancelled the operation or no prompt was selected.
   def duplicate_prompt
-    prompt = choose_prompt or return
+    prompt = choose_prompt(prompt: 'Which prompt shall be the basis for a new one? ') or return
     STDOUT.puts kramdown_ansi_parse(
       prompt.to_s + "\n---"
     )
@@ -203,7 +204,7 @@ module OllamaChat::PromptManagement
   # @return [self, nil] returns self if the export was successful, or nil if
   #   the process was cancelled during prompt selection or filename entry.
   def export_prompt
-    prompt = choose_prompt or return
+    prompt = choose_prompt(prompt: 'Which template are you exporting to disk? ') or return
     STDOUT.puts kramdown_ansi_parse(
       prompt.to_s + "\n---"
     )
@@ -213,6 +214,47 @@ module OllamaChat::PromptManagement
     self
   end
 
+  # Aggregates the current conversation history into a single string for
+  # context-aware generation.
+  #
+  # Each message is formatted as "Sender Name: Message Content",
+  # skipping messages that contain no content.
+  #
+  # @return [String] The flattened conversation history.
+  def prepare_conversation_history
+    messages.each_message.inject('') do |result, message|
+      message_content = message.content.full? or next result
+      sender_name     = sender_name_displayed(message, template: false)
+      result << "%s: %s" % [ sender_name, message_content ]
+    end
+  end
+
+  # Interactively generates follow-up prompt suggestions based on the current
+  # session.
+  #
+  # This method prompts the user to select a suggestion strategy (e.g., coding
+  # or roleplaying), constructs a prompt containing the conversation history,
+  # and requests a generation from the AI model. The resulting suggestions
+  # are then opened in the editor for final refinement before being returned.
+  #
+  # @return [String, nil] The refined suggestion text, or nil if the process
+  #   was cancelled.
+  def suggest_prompts
+    # Let the user pick a prompt template (e.g., suggest_coding, suggest_roleplaying)
+    instruction = choose_prompt(prompt: 'Which suggestion strategy shall we employ? ') or return
+
+    # Build the context by gathering all current conversation messages
+    history     = prepare_conversation_history
+    full_prompt = "Conversation History:\n#{history}\n\n#{instruction}"
+
+    # Execute a silent generation call (doesn't add to history)
+    response = generate(prompt: full_prompt)
+    suggestions = response.response
+
+    # Pass the AI's suggestions through the editor for final refinement
+    edit_text(suggestions)
+  end
+
   # Lists all prompt templates in the database, indicating which are defaults
   # and showing a truncated preview of their content.
   #
@@ -235,7 +277,7 @@ module OllamaChat::PromptManagement
   # Resets a prompt's content to the default value defined in the configuration.
   #
   # @param name [String, Symbol] the name of the prompt to reset
-  # @return [Boolean] true if the prompt was reset, false if no default was found
+  # @return [Boolean, nil] true if the prompt was reset, false if no default was found
   def reset_prompt_to_default(name)
     if content = config.prompts[name.to_s]
       store_prompt(name, content)

data/lib/ollama_chat/rag_handling.rb

@@ -42,7 +42,10 @@ module OllamaChat::RAGHandling
     choose_with_state do
       loop do
         tags = @documents.tags.to_a.unshift('[ALL]').unshift('[EXIT]')
-        tag = choose_entry(tags, prompt: 'Clear? %s')
+        tag = choose_entry(
+          tags,
+          prompt: 'What obsolete records are to be excised from the annals? '
+        )
         case tag
         when nil, '[EXIT]'
           STDOUT.puts "Exiting chooser."
@@ -80,7 +83,10 @@ module OllamaChat::RAGHandling
     collections = [ current_collection ] + @documents.collections.to_a
     collections = collections.filter_map(&:to_s).uniq.sort
     collections.unshift('[EXIT]').unshift('[NEW]')
-    collection = choose_entry(collections) || current_collection
+    collection = choose_entry(
+      collections,
+      prompt: 'Which archive of knowledge shall we delve into?'
+    ) || current_collection
     case collection&.to_s
     when '[NEW]'
       @documents.collection = ask?(

data/lib/ollama_chat/session_management.rb

@@ -506,7 +506,7 @@ module OllamaChat::SessionManagement
                      else
                        offer_new_session and sessions.unshift(SearchUI::Wrapper.new('[new]', display: '[NEW]'))
                        sessions = sessions.unshift(SearchUI::Wrapper.new('[exit]', display: '[EXIT]'))
-                       value = choose_entry(sessions)&.value
+                       value = choose_entry(sessions, prompt: 'Select a chat session: ')&.value
                        if value == '[new]'
                          return new_session
                        end

data/lib/ollama_chat/state_selectors.rb

@@ -90,7 +90,11 @@ module OllamaChat::StateSelectors
         SearchUI::Wrapper.new(state, display:)
       end
 
-      case chosen = choose_entry(states)
+      chosen = choose_entry(
+        states,
+        prompt: 'Which operational paradigm should be engaged?'
+      )
+      case chosen
       when '[EXIT]', nil
         STDOUT.puts "Exiting chooser."
       when

data/lib/ollama_chat/system_prompt_management.rb

@@ -85,7 +85,10 @@ module OllamaChat::SystemPromptManagement
   def change_system_prompt(default)
     prompts = all_system_prompts
     prompts.unshift('[MODEL DEFAULT]').unshift('[EXIT]')
-    chosen = choose_entry(prompts)
+    chosen = choose_entry(
+      prompts,
+      prompt: 'Which governing law shall we enact?'
+    )
     system_prompt_name =
       case chosen
       when '[EXIT]'
@@ -105,11 +108,14 @@ module OllamaChat::SystemPromptManagement
 
   # Presents an interactive menu to select a stored system prompt.
   #
+  # @param prompt [String] the prompt message to display when asking for input
+  #   (default: 'Select a system prompt: ')
+  #
   # @return [Object, nil] the selected system prompt object, or nil if cancelled
-  def choose_system_prompt
+  def choose_system_prompt(prompt: 'Select a system prompt: ')
     prompts = all_system_prompts
     prompts.unshift('[EXIT]')
-    case chosen = choose_entry(prompts)
+    case chosen = choose_entry(prompts, prompt:)
     when '[EXIT]', nil
       STDOUT.puts "Exiting chooser."
       return
@@ -122,7 +128,7 @@ module OllamaChat::SystemPromptManagement
   #
   # @return [self, nil] the current context on success, or nil if cancelled
   def info_system_prompt
-    if system_prompt = choose_system_prompt
+    if system_prompt = choose_system_prompt(prompt: 'Which system law would you like to review? ')
       use_pager do |output|
         output.puts kramdown_ansi_parse(<<~EOT)
           # System Prompt #{system_prompt.name}
@@ -163,7 +169,9 @@ module OllamaChat::SystemPromptManagement
   #
   # @return [self, nil] the current context on success, or nil if cancelled
   def choose_and_edit_system_prompt
-    system_prompt = choose_system_prompt or return
+    system_prompt = choose_system_prompt(
+      prompt: 'Which system directive needs rewriting? '
+    ) or return
     system_prompt.metadata['content'] = edit_text(system_prompt.metadata['content'].to_s)
     system_prompt.save
     ask_to_set_current_system_prompt(system_prompt.name)
@@ -175,7 +183,7 @@ module OllamaChat::SystemPromptManagement
   #
   # @return [self, nil] the current context on success, or nil if cancelled
   def choose_and_delete_system_prompt
-    system_prompt = choose_system_prompt or return
+    system_prompt = choose_system_prompt(prompt: 'Which old rule is now obsolete? ') or return
     STDOUT.puts kramdown_ansi_parse(
       system_prompt.to_s + "\n---"
     )
@@ -218,7 +226,7 @@ module OllamaChat::SystemPromptManagement
   # @return [self, nil] the current context on success, or nil if the user
   #   cancelled the operation or no system prompt was selected.
   def duplicate_system_prompt
-    system_prompt = choose_system_prompt or return
+    system_prompt = choose_system_prompt(prompt: 'Which core logic shall be cloned? ') or return
     STDOUT.puts kramdown_ansi_parse(
       system_prompt.to_s + "\n---"
     )
@@ -273,7 +281,7 @@ module OllamaChat::SystemPromptManagement
   # @return [self, nil] returns self if the export was successful, or nil if
   #   the process was cancelled during system prompt selection or filename entry.
   def export_system_prompt
-    prompt = choose_system_prompt or return
+    prompt = choose_system_prompt(prompt: 'Which system prompt are you archiving to disk? ') or return
     STDOUT.puts kramdown_ansi_parse(
       prompt.to_s + "\n---"
     )
@@ -286,7 +294,8 @@ module OllamaChat::SystemPromptManagement
   # Resets a system prompt's content to the default value defined in the configuration.
   #
   # @param name [String, Symbol] the name of the system prompt to reset
-  # @return [Boolean] true if the system prompt was reset, false if no default was found
+  # @return [Boolean, nil] true if the system prompt was reset, false if no
+  #   default was found
   def reset_system_prompt_to_default(name)
     if content = config.system_prompts[name.to_s]
       store_system_prompt(name, content)

data/lib/ollama_chat/tool_calling.rb

@@ -128,7 +128,11 @@ module OllamaChat::ToolCalling
       loop do
         select_tools = configured_tools - enabled_tools
         select_tools = [ '[EXIT]' ] + select_tools
-        case chosen = choose_entry(select_tools)
+        chosen = choose_entry(
+          select_tools,
+          prompt: 'Which capabilities should be granted to the model?'
+        )
+        case chosen
         when '[EXIT]', nil
           STDOUT.puts "Exiting chooser."
           return
@@ -155,7 +159,11 @@ module OllamaChat::ToolCalling
       loop do
         select_tools = enabled_tools
         select_tools = [ '[EXIT]' ] + select_tools
-        case chosen = choose_entry(select_tools)
+        chosen = choose_entry(
+          select_tools,
+          prompt: 'Which capabilities should be granted to the model?'
+        )
+        case chosen
         when '[EXIT]', nil
           STDOUT.puts "Exiting chooser."
           return

data/lib/ollama_chat/tools/retrieve_document_snippets.rb

@@ -18,6 +18,7 @@
 #   the underlying document store.
 class OllamaChat::Tools::RetrieveDocumentSnippets
   include OllamaChat::Tools::Concern
+  include Kramdown::ANSI::Width
 
   # @return [String] the registered name for this tool
   def self.register_name = 'retrieve_document_snippets'
@@ -74,6 +75,10 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
             text_count: Tool::Function::Parameters::Property.new(
               type: 'integer',
               description: 'The maximum number of snippets to return.'
+            ),
+            rerank: Tool::Function::Parameters::Property.new(
+              type: 'boolean',
+              description: 'Rerank the returned records if true, (default: true)'
             )
           },
           required: ['query']
@@ -102,6 +107,8 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
     text_size      = args.text_size.full? || chat.config.embedding.found_texts_size?
     text_count     = args.text_count.full? || chat.config.embedding.found_texts_count?
     min_similarity = args.min_similarity.full?
+    rerank         = args.rerank
+    rerank         = true if rerank.nil?
 
     old_collection = nil
 
@@ -112,14 +119,19 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
 
     records = find_document_records(chat, query, tags, text_size, text_count, min_similarity)
 
+    if rerank && records.any?
+      records = rerank_records(chat, query, records)
+    end
+
     message = records.map { |record|
       link = if record.source =~ %r(\Ahttps?://)
                record.source
              else
                'file://%s' % File.expand_path(record.source)
              end
+      link && record.tags.any? or next
       [ link, ?# + record.tags.first ]
-    }.uniq.map { |l, t| chat.hyperlink(l, t) }.join(' ')
+    }.flat_map { |l, t| chat.hyperlink(l, t) }.join(' ')
 
     {
       prompt: 'Consider these snippets generated from retrieval when formulating your response!',
@@ -131,6 +143,12 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
         }
       end,
       message:,
+      query:,
+      tags:,
+      min_similarity:,
+      text_size:,
+      text_count:,
+      rerank:,
     }.to_json
   rescue => e
     { error: e.class.name, message: e.message }.to_json
@@ -140,6 +158,39 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
 
   private
 
+  # Uses the active chat model to filter records based on the query.
+  #
+  # @param chat [OllamaChat::Chat] the active  chat instance
+  # @param query [String] the search query string
+  # @param records [Array<Documentrix::Utils::TagResult>] the initial set of
+  #   found records
+  #
+  # @return [Array<Documentrix::Utils::TagResult>] the filtered array of
+  # records
+  #
+  # @raise [RuntimeError] if the 'rerank' prompt is missing from the
+  #   configuration
+  def rerank_records(chat, query, records)
+    candidates = records.each_with_index.map { |r, i|
+      "[#{i}] #{truncate(r.text.strip, length: 300)}"
+    }.join("\n")
+
+    prompt = chat.prompt('rerank') or raise "missing prompt 'rerank'"
+    prompt = prompt.to_s % { query:, candidates: }
+
+    begin
+      # We use the active chat model to perform the surgical precision
+      # filtering
+      if response = chat.generate(prompt:)&.response.full?
+        indices  = response.scan(/\d+/).map(&:to_i).select { |i| (0...records.size).include?(i) }
+        records  = records.values_at(*indices) if indices.any?
+      end
+    rescue => e
+      chat.log(:error, "Attempted reranking, caught #{e.class} #{e}")
+    end
+    records
+  end
+
   # The find_document_records method searches for document records matching the
   # given query string.
   #

data/lib/ollama_chat/version.rb

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

@@ -49,7 +49,10 @@ describe OllamaChat::InputContent do
 
       # Mock the selection process
       expect(chat).to receive(:choose_entry).
-        with(files.unshift('[EXIT]')).and_return(files[1])
+        with(
+          files.unshift('[EXIT]'),
+          prompt: 'Select a file to import: ',
+        ).and_return(files[1])
 
       result = chat.choose_filename('spec/assets/**/*.txt')
       expect(result).to eq Pathname.new(files[1])

data/spec/ollama_chat/state_selectors_spec.rb

@@ -123,7 +123,8 @@ describe OllamaChat::StateSelectors::StateSelector do
     it 'allows user to select a state from available options' do
       # Mock the chooser to return a specific choice
       expect(selector).to receive(:choose_entry).with(
-        %w[ [EXIT] enabled disabled low high ]
+        %w[ [EXIT] enabled disabled low high ],
+        prompt: 'Which operational paradigm should be engaged?'
       ).and_return(double(value: 'low'))
 
       selector.choose

data/spec/ollama_chat/tools/retrieve_document_snippets_spec.rb

@@ -25,6 +25,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
           min_similarity: nil,
           text_size: nil,
           text_count: nil,
+          rerank: false,
         )
       )
     )
@@ -68,6 +69,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
           min_similarity: nil,
           text_size: nil,
           text_count: nil,
+          rerank: false,
         )
       )
     )
@@ -79,7 +81,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
       [
         double(
           'Record',
-          text:       'quux',
+          text:       'quintessential ruby',
           source:     'foo',
           tags:       %w[ ruby expert ],
           tags_set:   [],
@@ -107,6 +109,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
           min_similarity: nil,
           text_size: nil,
           text_count: nil,
+          rerank: false,
         )
       )
     )
@@ -141,6 +144,78 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     expect(json.message).to eq('Empty query')
   end
 
+  it 'performs reranking when rerank is true' do
+    tool_call = double(
+      'ToolCall',
+      function: double(
+        name: 'retrieve_document_snippets',
+        arguments: double(
+          query: 'Ruby array',
+          tags: nil,
+          collection: nil,
+          min_similarity: nil,
+          text_size: nil,
+          text_count: nil,
+          rerank: true,
+        )
+      )
+    )
+
+    records = [
+      double('Record', text: 'first', source: 's1', tags: [], tags_set: [], similarity: 0.1),
+      double('Record', text: 'second', source: 's2', tags: [], tags_set: [], similarity: 0.9)
+    ]
+
+    tool = described_class.new
+    expect(tool).to receive(:find_document_records).and_return(records)
+
+    allow(chat).to receive(:prompt).with('rerank').and_return("template %{query} %{candidates}")
+    response_val = double('Response', response: double('FullResponse', full?: '1', response: '1'))
+    allow(chat).to receive(:generate).with(prompt: anything).and_return(response_val)
+
+    result = tool.execute(tool_call, chat:)
+    json = json_object(result)
+
+    expect(json.snippets.size).to eq 1
+    expect(json.snippets.first.text).to eq 'second'
+  end
+
+  it 'performs reranking when rerank is nil (defaults to true)' do
+    tool_call = double(
+      'ToolCall',
+      function: double(
+        name: 'retrieve_document_snippets',
+        arguments: double(
+          query: 'Ruby array',
+          tags: nil,
+          collection: nil,
+          min_similarity: nil,
+          text_size: nil,
+          text_count: nil,
+          rerank: nil,
+        )
+      )
+    )
+
+    records = [
+      double('Record', text: 'first', source: 's1', tags: [], tags_set: [], similarity: 0.1),
+      double('Record', text: 'second', source: 's2', tags: [], tags_set: [], similarity: 0.9)
+    ]
+
+    tool = described_class.new
+    expect(tool).to receive(:find_document_records).and_return(records)
+
+    allow(chat).to receive(:prompt).with('rerank').and_return("template %{query} %{candidates}")
+    response_val = double('Response', response: double('FullResponse', full?: '0', response: '0'))
+    allow(chat).to receive(:generate).with(prompt: anything).and_return(response_val)
+
+    result = tool.execute(tool_call, chat:)
+    json = json_object(result)
+
+    expect(json.snippets.size).to eq 1
+    expect(json.snippets.first.text).to eq 'first'
+  end
+
   it 'can be converted to hash' do
     expect(described_class.new.to_hash).to be_a(Hash)
   end

metadata

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