ollama_chat 0.0.96 → 0.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54aa30ed02a44f43f0f197247d4e7f5377007802025ddc55632f60965e6d0548
-  data.tar.gz: aa6e058dd8135e265fbfbc848620ece0730182ff6c11e4b0e9c87a8b68e97590
+  metadata.gz: 83e62a371bea41c14f117fc546d3acf8e8a22d6c7f3be71a06f5dbb9f76a0201
+  data.tar.gz: 1348fecdb529bd12784e3843fcee09228d422db9f82a06554e6cf1923d318971
 SHA512:
-  metadata.gz: 96d53286b971b4863f688a8613e9ca3fe3e0ee65b9c5f18b042ea3a910ea8ef8cdb4b2e2b26750c08aae6bcbbdd43371e8f0fd9598f24c494256f58f42ddd8ef
-  data.tar.gz: 1d5aa2eadaa9723f6a20f1019f6965249e9d526d38bd6de5d5e86ed1b76ac82e86bf0e59915330f35a2a48f0ce99c6a4109a50c94d38e30965f4d658be768ce3
+  metadata.gz: f53884d1050759f8d32731f872e3746f92fc3b9747ecfdb12015bafc39cd98dd1e3fc977c831f116a7b95ece70fd8fc2cbfc760803d06207a2cf49584138a6de
+  data.tar.gz: 78144c20b98504852ce74ce33709b9a5592865d9fc75c49edc5cb23ce93a767275d5f090c38d77450be6e503b5b37cdbe895650b25f0e07f91cb118d8a7f59dc

data/CHANGES.md

@@ -1,5 +1,60 @@
 # Changes
 
+## 2026-07-06 v0.0.97
+
+### New Features
+
+- **Session-Specific Context Formatting**: 
+    - Introduced the `/context_format` command to manage context formats per
+      session.
+    - Added a database migration `005_add_context_format_to_sessions.rb` to
+      include the `context_format` column in the `sessions` table.
+    - Updated `OllamaChat::Database::Models::Session` with presence validations
+      and initialization for `context_format`.
+    - Implemented a `context_format` state selector using
+      `DatabaseStateSelector` in `lib/ollama_chat/state_selectors.rb`.
+    - Integrated session-based format selection into
+      `OllamaChat::InputContent#context_spook` and
+      `OllamaChat::Tools::FileContext#execute`.
+- **Persona Management**: 
+    - Added a `copy` subcommand to the `/persona` command.
+    - Updated `select_persona_path` in `lib/ollama_chat/personae_management.rb`
+      to support a `no_prefill` keyword argument, affecting `@prefill_prompt`
+      assignment logic.
+
+### Improvements & Refactorings
+
+- **Generation API**: 
+    - Refactored `OllamaChat::Chat#generate` to utilize `ollama.chat`,
+      returning a string directly and supporting an optional `system` prompt.
+    - Implemented `OllamaChat::SystemPromptManagement#raw_system_prompt` for
+      resolving active system prompts.
+    - Enhanced `OllamaChat::PromptManagement#suggest_prompts` with an `edit:`
+      parameter and improved formatting.
+- **Embedding & Import Logic**: 
+    - Updated the `embed` prompt template in `default_config.yml` to include
+      `%{source}`.
+    - Modified `#embed` in `lib/ollama_chat/source_fetching.rb` to pass the
+      `source` variable during interpolation.
+    - Added `disable_content_parsing` to `'update'` and `'embedding'` command
+      paths in `lib/ollama_chat/commands.rb` to prevent recursive imports of
+      system status messages.
+- **Documentation & UX**: 
+    - Expanded `README.md` with detailed guides for `/input` and a new "Power
+      User Features" section (covering `/character`, `/prompt suggest`,
+      `/model` profiles, and `/session summarize`).
+    - Corrected the help text flag in `lib/ollama_chat/information.rb` from
+      `-s` to `-l`.
+
+### Bug Fixes & Maintenance
+
+- Added `validates_presence :profile` to the `validate` method in
+  `lib/ollama_chat/database/models/model_options.rb`.
+- Ensured character names are cast to strings in `lib/ollama_chat/parsing.rb`
+  for type consistency.
+- Updated `/prompt` command regex and argument logic in
+  `lib/ollama_chat/commands.rb`.
+
 ## 2026-07-03 v0.0.96
 
 ### New Features

data/README.md

@@ -103,7 +103,120 @@ connect can be configured in the environment variable `OLLAMA_CHAT_MODEL`.
 The YAML config file is stored in `$XDG_CONFIG_HOME/ollama_chat/config.yml` and
 you can use it for more complex settings.
 
-### Example: Using a Persona
+### The `/input` Command: Advanced Context Injection
+
+The `/input` command is a versatile tool designed to bring external data into
+your conversation context. Instead of manually copying and pasting, `/input`
+allows you to target files, URLs, or even live system output using powerful
+filters.
+
+#### 1. Understanding "Sources"
+
+One of the most powerful aspects of `/input` is its definition of a **source**.
+A source isn't just a filename; it can be any of the following:
+
+*   **Local Files**: Standard paths (e.g., `lib/ollama_chat.rb`) or quoted paths
+    for those with spaces.
+*   **Remote URLs**: Any `http://` or `https://` link. The command will fetch the
+    web content and parse it before importing.
+*   **Shell Commands (`!`)**: Any source starting with an exclamation mark is
+    executed as a shell command, and its **STDOUT** is imported as the content. 
+    *   *Example*: `/input !ls -la` imports the current directory listing.
+    *   *Example*: `/input !git branch` tells the AI which branch you are on.
+
+#### 2. Subcommands
+
+Depending on how you want the AI to "see" the data, you can use different
+subcommands:
+
+*   **`import` (Default)**: The standard way to bring content in. It reads the
+    source and formats it for the chat.
+*   **`path`**: Specifically targets local files to read their raw content.
+*   **`summary`**: Instead of importing the whole file, this uses the LLM to
+    generate a concise summary first. Use `-w <words>` to control the length
+    (default: 100).
+*   **`embedding`**: Sends the content directly into your RAG vector database
+    rather than the immediate chat window. Use `-c <collection>` for specific
+    collections and `-t <tags>` to categorize the data.
+*   **`context`**: Uses `ContextSpook` to generate a comprehensive structural dump
+    of your project, providing both the architectural skeleton and full file
+    contents in a high-density format.
+
+#### 3. The Power of Patterns (`-p`)
+
+By adding the `-p` flag, you can use Unix-style globs to select multiple files
+at once.
+
+*   **Interactive Selection**: By default, when using patterns, `ollama_chat` will
+    present an interactive menu allowing you to pick exactly which matching
+    files you want to import.
+*   **Bulk Import (`-a`)**: Use the `-a` (all) flag alongside `-p` to bypass the
+    menu and import every file that matches the pattern automatically.
+
+#### 4. Refining the Input
+
+*   **Editing on the Fly (`-e`)**: For the `import` and `path` subcommands, you
+    can use the `-e` flag. This opens the content in your default editor,
+    allowing you to trim or modify the text before it is sent to the LLM.
+*   **Custom Tags**: When embedding, tags allow you to create "slices" of
+    knowledge that can be retrieved later based on specific categories.
+
+#### Examples
+
+| Goal | Command |
+| :--- | :--- |
+| **Import a single file** | `/input path lib/ollama_chat.rb` |
+| **Input the output of a command** | `/input !env` |
+| **Summarize multiple files (Interactive)** | `/input summary -p "spec/**/*_spec.rb"` |
+| **Bulk import all Ruby files in `lib/`** | `/input -p "lib/**/*.rb" -a` |
+| **Embed a doc into a specific collection** | `/input embedding -c documentation-v1 "docs/api.md"` |
+| **Import and edit a URL's content** | `/input -e https://example.com/guide` |
+| **Generate project context for the AI** | `/input context` |
+
+### 🚀 Power User Features
+
+Beyond basic chat, **ollama_chat** includes several advanced systems designed
+for high-end AI orchestration and personalization.
+
+#### 1. The Character & Persona Engine
+The bot supports a sophisticated roleplay system that goes beyond simple text prompts.
+
+*   **SillyTavern Compatibility (`/character`)**: You can import character
+    cards directly from PNG or JSON files. This supports the SillyTavern
+    standard, allowing you to load entire personalities—including metadata and
+    example dialogues—embedded within an image file.
+    *   *Example*: `/character import fluffy.png`
+*   **Persona Management (`/persona`)**: Create, duplicate, and export complex
+    persona profiles. You can use `/persona play` to activate a personality as
+    your default for the session.
+
+#### 2. Intelligent Prompt Engineering (`/prompt suggest`)
+
+Instead of guessing the right prompt, you can let the AI help you write one.
+The `suggest` subcommand analyzes your current session history and utilizes
+specialized strategies (like `suggest_coding` or `suggest_roleplaying`) to
+generate a tailored prompt template for you to refine.
+
+#### 3. Model Profile Orchestration (`/model`)
+
+Avoid the tedious task of re-configuring model parameters every time you
+switch. The profile system allows you to manage "Live" vs "Saved" settings:
+*   **Saved -> Live**: Apply a pre-configured profile's settings (temperature,
+    top\_p, etc.) to your current session using `options to session`.
+*   **Live -> Saved**: After fine-tuning your model's behavior during a chat,
+    "bake" those live settings into a permanent profile using `options from
+    session`.
+
+#### 4. Conversation Archiving (`/session summarize`)
+
+Turn your long-form brainstorming sessions into structured documents. The
+`/session summarize` command can distill an entire conversation into a concise
+summary.
+*   **Quick View**: Use `-s` for a one-sentence executive summary.
+*   **Archiving**: Use `-f <filename>` to dump the full summary directly into a
+    Markdown file, creating an automatic journal of your project's evolution.
+
+### Using a Persona
 
 You can import a persona profile from a Markdown file and load it into the
 current session. The persona's content is then interpolated into the system
@@ -140,7 +253,7 @@ seems to be the problem that has brought you to our humble abode at 221B Baker
 Street?
 ```
 
-### Example: Using a multimodal model
+### Using a multimodal model
 
 This example shows how an image like this can be sent to the LLM for multimodal
 analysis:

data/lib/ollama_chat/chat.rb

@@ -230,23 +230,39 @@ class OllamaChat::Chat
     @messages.system_name
   end
 
-  # The generate method sends a prompt to the Ollama model and returns the
-  # result.
-  #
-  # @param prompt [ String ] the prompt to send to the model
-  #
-  # @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:,
-      options: model_options,
-      stream: false,
-      think: false,
-    )
+  # Sends a structured chat request to the Ollama model and returns the
+  # response content.
+  #
+  # This method creates a minimal conversation consisting of a system message
+  # and a user message, executing it as a one-shot chat interaction.
+  #
+  # @param system [String] the system prompt to guide the model's behavior
+  # (defaults to current raw_system_prompt)
+  #
+  # @param prompt [String] the user prompt to send to the model
+  #
+  # @return [String] the content of the resulting response message
+  def generate(system: raw_system_prompt, prompt:)
+    messages = [
+      OllamaChat::Message.new(
+        role:        'system',
+        content:     system,
+      ),
+
+      OllamaChat::Message.new(
+        role: 'user',
+        content: prompt
+      ),
+    ]
+
+    ollama.chat(
+      model:    @model,
+      messages: ,
+      options:  model_options,
+      stream:   false,
+      think:    false,
+      tools:
+    )&.message&.content.to_s
   end
 
   private

data/lib/ollama_chat/commands.rb

@@ -234,6 +234,15 @@ module OllamaChat::Commands
     :next
   end
 
+  command(
+    name: :context_format,
+    regexp: %r(^/context_format$),
+    help: 'Configure the context_format for context_spook JSON|TOON',
+  ) do
+    context_format.choose
+    :next
+  end
+
   command(
     name: :tools,
     regexp: %r(^/tools(?:\s+(on|off|enable|disable))?),
@@ -481,7 +490,7 @@ module OllamaChat::Commands
 
   command(
     name: :prompt,
-    regexp: %r(^/prompt(\s+-e)?(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|suggest))?(?:\s+(\S+))?$),
+    regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|suggest|-e))?(\s+-e)?(?:\s+(\S+))?$),
     complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset suggest ] ],
     optional: true,
     help: <<~EOT,
@@ -495,7 +504,7 @@ module OllamaChat::Commands
       Options: -e to edit the next prompt
         instead of prefilling
     EOT
-  ) do |opts, subcommand, filename|
+  ) do |subcommand, opts, filename|
     case subcommand
     when 'add'
       add_new_prompt
@@ -526,11 +535,11 @@ module OllamaChat::Commands
         end
       end
     when 'suggest'
-      prompt = suggest_prompts and next prompt
-    when nil
-      opts = go_command('e', opts)
+      opts   = go_command('e', opts)
+      prompt = suggest_prompts(edit: opts[?e]) and next prompt
+    when nil, '-e'
       if prompt = choose_prompt(prompt: 'Which template shall guide the next response? %s').full?(&:to_s)
-        if opts[?e]
+        if subcommand
           prompt = edit_text(prompt)
           next prompt
         else
@@ -595,7 +604,10 @@ module OllamaChat::Commands
     when 'rename'
       rename_collection(collection)
     when 'update'
-      results = update_collection and next results
+      if results = update_collection
+        disable_content_parsing
+        next results
+      end
     when nil
       collection_stats
     end
@@ -606,8 +618,8 @@ module OllamaChat::Commands
 
   command(
     name: :persona,
-    regexp: %r(^/persona(?:\s+(play|load|edit|info|list|add|delete|backup|import|export|duplicate))?$),
-    complete: [ 'persona', %w[ play load edit info list add delete backup import export duplicate ] ],
+    regexp: %r(^/persona(?:\s+(play|load|edit|info|list|add|delete|backup|import|export|duplicate|copy))?$),
+    complete: [ 'persona', %w[ play load edit info list add delete backup import export duplicate copy ] ],
     optional: true,
     help: <<~EOT,
       Manage and activate personae for roleplay:
@@ -616,6 +628,7 @@ module OllamaChat::Commands
                   and start roleplaying
           - load: Load a specific persona
                   into session
+          - copy: persona pathname to clipboard
         - Management:
           - add: Create a new persona
           - edit: Modify an existing persona
@@ -670,6 +683,9 @@ module OllamaChat::Commands
     when 'play'
       set_default_persona
       :next
+    when 'copy'
+      select_persona_path(no_prefill: true)
+      :next
     else
       select_persona_path
       :next
@@ -805,6 +821,7 @@ module OllamaChat::Commands
         next context_spook(nil) || :next
       end
     when 'embedding'
+      disable_content_parsing
       opts = go_command('pac:t:', opts)
       switch_collection(opts[?c]) do |other_collection|
         if collection == other_collection and !confirm?(

data/lib/ollama_chat/database/migrations/005_add_context_format_to_sessions.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    add_column :sessions, :context_format, String, null: false, default: 'JSON'
+  end
+end

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

@@ -12,6 +12,7 @@ class OllamaChat::Database::Models::ModelOptions < Sequel::Model(OllamaChat::DB)
     super
     validates_presence :model_name
     validates_unique [ :model_name, :profile ]
+    validates_presence :profile
   end
 
   # @!attribute [v] id

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

@@ -25,6 +25,20 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
     validates_unique :name
     validates_presence :updated_at
     validates_presence :created_at
+
+    validates_presence :context_format
+    validates_presence :current_voice
+    validates_presence :document_policy
+    validates_presence :embedding_enabled
+    validates_presence :location_enabled
+    validates_presence :markdown_enabled
+    validates_presence :runtime_info_enabled
+    validates_presence :stream_enabled
+    validates_presence :think_loud_enabled
+    validates_presence :think_mode
+    validates_presence :think_strip_enabled
+    validates_presence :tools_enabled
+    validates_presence :voice_enabled
   end
 
   # Calculates the age of the session based on the last update timestamp.
@@ -93,6 +107,9 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
   # @!attribute [v] current_voice
   #   @return [String] The name of the voice currently in use.
   #
+  # @!attribute [v] context_format
+  #   @return [String] The format used for project context generation (e.g., 'JSON', 'TOON').
+  #
   # @!attribute [v] working_directory
   #   @return [String] The directory used as the working context for this session.
   #
@@ -144,6 +161,7 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
       voice_enabled:         chat.config.voice.enabled,
       model_options:         ,
       current_voice:         chat.config.voice.default,
+      context_format:        chat.config.context.format,
       working_directory:     Dir.pwd,
       messages:              '',
     }

data/lib/ollama_chat/information.rb

@@ -142,6 +142,7 @@ module OllamaChat::Information
       output.print '  '; voices.show(output:)
     end
     output.print '  '; location.show(output:)
+    output.print '  '; context_format.show(output:)
   end
 
   # Displays the current runtime environment details, split into static
@@ -232,7 +233,7 @@ module OllamaChat::Information
         -V             display the current version number and quit
         -h             this help
 
-        Use `?selector` with `-m` or `-s` to filter options. Multiple matches
+        Use `?selector` with `-m` or `-l` to filter options. Multiple matches
         will open a chooser dialog.
     EOT
     0

data/lib/ollama_chat/input_content.rb

@@ -92,7 +92,7 @@ module OllamaChat::InputContent
   # @example Load default context
   #   context_spook(nil)
   def context_spook(patterns, all: false)
-    format = config.context.format
+    format = @context_format.selected
     myself = self
     if patterns
       ContextSpook::generate_context(verbose: true, format:) do |context|

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -24,7 +24,7 @@ infobar:
       :frames: :braille181
       :message: ✓
 prompts:
-  embed: This source has been added to or updated in collection "%{collection}".
+  embed: The source %{source} has been added to or updated in collection "%{collection}".
   rerank: |
     Query: %{query}
     Candidates:

data/lib/ollama_chat/parsing.rb

@@ -78,7 +78,7 @@ module OllamaChat::Parsing
     if data = metadata.delete('chara') and
         (char, char_data = OllamaChat::Utils::PNGMetadataExtractor.decode_character(data))
       then
-      name = char_data.dig('data', 'name').full? || Pathname.new(source_io.path).basename.sub_ext('')
+      name = char_data.dig('data', 'name').full? || Pathname.new(source_io.path).basename.sub_ext('').to_s
       results << "Character Profile:\n\n#{personalize_character_profile(char, name:)}"
     end
 

data/lib/ollama_chat/personae_management.rb

@@ -262,13 +262,14 @@ module OllamaChat::PersonaeManagement
   # Prompts the user to select a persona, copies its filesystem path to the
   # clipboard, and sets it as the prefill prompt for the next interaction.
   #
+  # @param [Boolean] no_prefill Whether to skip updating the prefill prompt.
   # @return [String, nil] the filesystem path of the selected persona,
   #   or nil if the selection was cancelled.
-  def select_persona_path
+  def select_persona_path(no_prefill: false)
     persona = choose_persona(prompt: "Which persona's path do you need? %s") or return
     path = persona_name_to_pathname(persona).to_s
     perform_copy_to_clipboard(text: path, edit: false)
-    @prefill_prompt = path
+    no_prefill or @prefill_prompt = path
     path
   end
 
@@ -579,13 +580,12 @@ module OllamaChat::PersonaeManagement
   # @param persona_name [String] the name of the character to replace {{char}} with
   # @return [String] the resulting structured Markdown persona profile
   def convert_json_character_to_markdown(character, persona_name)
-    response = generate(
+    generate(
       prompt:  prompt(:persona_architect).to_s % {
         character:,
         persona_template: prompt(:persona).to_s
       }
-    ).response
-    response.gsub(/{{user}}/i, '%{user}').gsub(/{{char}}/i, persona_name)
+    ).gsub(/{{user}}/i, '%{user}').gsub(/{{char}}/i, persona_name)
   end
 
   # Interactively exports a persona profile to a specified file.

data/lib/ollama_chat/prompt_management.rb

@@ -232,24 +232,38 @@ module OllamaChat::PromptManagement
   # 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.
+  # This method constructs a prompt containing the conversation history and an
+  # instruction (either selected from a template or provided manually) and
+  # requests a generation from the AI model. The resulting suggestions are then
+  # opened in the editor for final refinement before being returned.
+  #
+  # @param edit [Boolean] If true, allows the user to write a custom suggestion
+  #   instruction on the fly; otherwise, prompts the user to pick a template.
   #
   # @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? %s') or return
+  def suggest_prompts(edit: false)
+    instruction = nil
+    if edit
+      # Let the user write a suggestion instruction on the fly
+      instruction = edit_text('')
+    else
+      # Let the user pick a prompt template (e.g., suggest_coding, suggest_roleplaying)
+      instruction = choose_prompt(prompt: 'Which suggestion strategy shall we employ? %s') or return
+    end
 
     # Build the context by gathering all current conversation messages
     history     = prepare_conversation_history
-    full_prompt = "Conversation History:\n#{history}\n\n#{instruction}"
+    full_prompt = <<~EOT
+      Conversation History:
+      #{history}
+
+      Instruction:
+      #{instruction}
+    EOT
 
-    # Execute a silent generation call (doesn't add to history)
-    response = generate(prompt: full_prompt)
-    suggestions = response.response
+    # Execute a silent chat oneshot call (doesn't add to history)
+    suggestions  = generate(prompt: full_prompt)
 
     # Pass the AI's suggestions through the editor for final refinement
     edit_text(suggestions)

data/lib/ollama_chat/session_management.rb

@@ -349,7 +349,7 @@ module OllamaChat::SessionManagement
         prompt:  prompt(:session_summarize).to_s % {
           sender_name:, unit:, message_content:, message_thinking:, context:
         }
-      ).response
+      )
       content = if pretty
                   '**%s**: %s' % [ sender_name_output, summary ]
                 else
@@ -380,7 +380,7 @@ module OllamaChat::SessionManagement
       c << "%s: %s\n\n" % [ sender_name, message.content ]
     end
     prompt = prompt(:session_title).to_s % { length:, content: }
-    generate(prompt:).response.full? do |name|
+    generate(prompt:).full? do |name|
       name = name.
         gsub(/(\A(\s|[^A-Za-z])+|(\s|[^A-Za-z])+\z)/m, '').
         gsub(/\s+/, ' ')

data/lib/ollama_chat/source_fetching.rb

@@ -246,7 +246,7 @@ module OllamaChat::SourceFetching
       source_io.rewind
       embed_source(source_io, source, tags:) or return
     end
-    prompt(:embed).to_s % { collection: }
+    prompt(:embed).to_s % { source:, collection: }
   end
 
   private

data/lib/ollama_chat/state_selectors.rb

@@ -241,6 +241,14 @@ module OllamaChat::StateSelectors
   #   that manages the currently selected voice for the chat session
   attr_reader :voices
 
+  # The context_format reader returns the context format selector for the
+  # chat session.
+  #
+  # @return [ OllamaChat::StateSelector ] the context format selector object
+  #   that manages the format used for project context generation
+  #   (e.g., 'JSON', 'TOON')
+  attr_reader :context_format
+
   # Sets up state selectors for document policy and think mode based on the
   # provided configuration.
   #
@@ -268,5 +276,11 @@ module OllamaChat::StateSelectors
       states:      config.voice.list,
       allow_empty: true
     )
+    @context_format = DatabaseStateSelector.new(
+      chat:      self,
+      attribute: :context_format,
+      name:      'Context format',
+      states:    %w[ JSON TOON ],
+    )
   end
 end

data/lib/ollama_chat/system_prompt_management.rb

@@ -41,6 +41,27 @@ module OllamaChat::SystemPromptManagement
     messages.system_name
   end
 
+  # Resolves the currently active system prompt name to its raw text content.
+  #
+  # If the current system prompt is set to 'model_default', this method
+  # retrieves the default prompt associated with the loaded model. Otherwise,
+  # it fetches the content of the specifically named system prompt from the
+  # database.
+  #
+  # The returned string represents the base template; any dynamic placeholders
+  # (e.g., %{persona} and %{runtime_info}) are nullified to ensure only the raw
+  # structure is returned.
+  #
+  # @return [String] The raw text content of the active system prompt.
+  def raw_system_prompt
+    system_name =  current_system_prompt_name
+    if system_name == 'model_default'
+      model_default_system_prompt.to_s
+    else
+      system_prompt(system_name).to_s
+    end % { persona: nil, runtime_info: nil }
+  end
+
   # Retrieves the content of the system prompt currently active in the chat
   # session.
   #

data/lib/ollama_chat/think_control.rb

@@ -5,7 +5,6 @@
 # thinking modes, checking the current state, and displaying the current
 # think mode status.
 module OllamaChat::ThinkControl
-
   # An array of strings representing the valid configuration states for the
   # thinking mode.
   #

data/lib/ollama_chat/tools/file_context.rb

@@ -65,9 +65,10 @@ class OllamaChat::Tools::FileContext
   # @return [String] the generated context data in the configured format (JSON by default)
   # @return [String] a JSON string containing error information if the operation fails
   def execute(tool_call, **opts)
-    config      = opts[:chat].config
+    chat        = opts[:chat]
+    config      = chat.config
     pattern     = tool_call.function.arguments.pattern
-    format      = config.context.format
+    format      = chat.context_format.selected
 
     directory   = Pathname.new(tool_call.function.arguments.directory || ?.)
     search_path = directory + pattern

data/lib/ollama_chat/tools/retrieve_document_snippets.rb

@@ -188,7 +188,7 @@ class OllamaChat::Tools::RetrieveDocumentSnippets
     begin
       # We use the active chat model to perform the surgical precision
       # filtering
-      if response = chat.generate(prompt:)&.response.full?
+      if response = chat.generate(prompt:).full?
         indices  = response.scan(/\d+/).map(&:to_i).select { |i| (0...records.size).include?(i) }
         records  = records.values_at(*indices) if indices.any?
       end

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.96'
+  VERSION         = '0.0.97'
   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.96 ruby lib
+# stub: ollama_chat 0.0.97 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.96".freeze
+  s.version = "0.0.97".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/command_concern.rb".freeze, "lib/ollama_chat/commands.rb".freeze, "lib/ollama_chat/config_handling.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/database.rb".freeze, "lib/ollama_chat/database/duplicatable.rb".freeze, "lib/ollama_chat/database/migrations.rb".freeze, "lib/ollama_chat/database/migrations/001_initial_schema.rb".freeze, "lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb".freeze, "lib/ollama_chat/database/models/favourite.rb".freeze, "lib/ollama_chat/database/models/model_options.rb".freeze, "lib/ollama_chat/database/models/prompt.rb".freeze, "lib/ollama_chat/database/models/session.rb".freeze, "lib/ollama_chat/database/session_locking.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/favourites_management.rb".freeze, "lib/ollama_chat/file_editing.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/http_handling.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/links_set.rb".freeze, "lib/ollama_chat/location_handling.rb".freeze, "lib/ollama_chat/logging.rb".freeze, "lib/ollama_chat/message.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/oc.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/pager.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/personae_management.rb".freeze, "lib/ollama_chat/prompt_handling.rb".freeze, "lib/ollama_chat/prompt_management.rb".freeze, "lib/ollama_chat/rag_handling.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/session_management.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/state_selectors.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/system_prompt_management.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/token_estimator.rb".freeze, "lib/ollama_chat/token_estimator/crude.rb".freeze, "lib/ollama_chat/tool_calling.rb".freeze, "lib/ollama_chat/tools.rb".freeze, "lib/ollama_chat/tools/browse.rb".freeze, "lib/ollama_chat/tools/compute_bmi.rb".freeze, "lib/ollama_chat/tools/concern.rb".freeze, "lib/ollama_chat/tools/copy_to_clipboard.rb".freeze, "lib/ollama_chat/tools/delete_file.rb".freeze, "lib/ollama_chat/tools/directory_structure.rb".freeze, "lib/ollama_chat/tools/eval_ruby.rb".freeze, "lib/ollama_chat/tools/execute_grep.rb".freeze, "lib/ollama_chat/tools/execute_ri.rb".freeze, "lib/ollama_chat/tools/file_context.rb".freeze, "lib/ollama_chat/tools/gem_path_lookup.rb".freeze, "lib/ollama_chat/tools/generate_image.rb".freeze, "lib/ollama_chat/tools/generate_password.rb".freeze, "lib/ollama_chat/tools/get_current_weather.rb".freeze, "lib/ollama_chat/tools/get_cve.rb".freeze, "lib/ollama_chat/tools/get_endoflife.rb".freeze, "lib/ollama_chat/tools/get_ghr.rb".freeze, "lib/ollama_chat/tools/get_jira_issue.rb".freeze, "lib/ollama_chat/tools/get_location.rb".freeze, "lib/ollama_chat/tools/get_rfc.rb".freeze, "lib/ollama_chat/tools/get_time.rb".freeze, "lib/ollama_chat/tools/get_url.rb".freeze, "lib/ollama_chat/tools/move_file.rb".freeze, "lib/ollama_chat/tools/open_file_in_editor.rb".freeze, "lib/ollama_chat/tools/paste_from_clipboard.rb".freeze, "lib/ollama_chat/tools/paste_into_editor.rb".freeze, "lib/ollama_chat/tools/patch_file.rb".freeze, "lib/ollama_chat/tools/read_file.rb".freeze, "lib/ollama_chat/tools/resolve_tag.rb".freeze, "lib/ollama_chat/tools/retrieve_document_snippets.rb".freeze, "lib/ollama_chat/tools/roll_dice.rb".freeze, "lib/ollama_chat/tools/run_tests.rb".freeze, "lib/ollama_chat/tools/search_web.rb".freeze, "lib/ollama_chat/tools/write_file.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/analyze_directory.rb".freeze, "lib/ollama_chat/utils/backup.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/json_jsonl_io.rb".freeze, "lib/ollama_chat/utils/path_completer.rb".freeze, "lib/ollama_chat/utils/path_validator.rb".freeze, "lib/ollama_chat/utils/png_metadata_extractor.rb".freeze, "lib/ollama_chat/utils/tag_resolver.rb".freeze, "lib/ollama_chat/utils/utf8_converter.rb".freeze, "lib/ollama_chat/utils/value_formatter.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "config/sherlock.md".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/command_concern.rb".freeze, "lib/ollama_chat/commands.rb".freeze, "lib/ollama_chat/config_handling.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/database.rb".freeze, "lib/ollama_chat/database/duplicatable.rb".freeze, "lib/ollama_chat/database/migrations.rb".freeze, "lib/ollama_chat/database/migrations/001_initial_schema.rb".freeze, "lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb".freeze, "lib/ollama_chat/database/models/favourite.rb".freeze, "lib/ollama_chat/database/models/model_options.rb".freeze, "lib/ollama_chat/database/models/prompt.rb".freeze, "lib/ollama_chat/database/models/session.rb".freeze, "lib/ollama_chat/database/session_locking.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/favourites_management.rb".freeze, "lib/ollama_chat/file_editing.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/http_handling.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/links_set.rb".freeze, "lib/ollama_chat/location_handling.rb".freeze, "lib/ollama_chat/logging.rb".freeze, "lib/ollama_chat/message.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/oc.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/pager.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/personae_management.rb".freeze, "lib/ollama_chat/prompt_handling.rb".freeze, "lib/ollama_chat/prompt_management.rb".freeze, "lib/ollama_chat/rag_handling.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/session_management.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/state_selectors.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/system_prompt_management.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/token_estimator.rb".freeze, "lib/ollama_chat/token_estimator/crude.rb".freeze, "lib/ollama_chat/tool_calling.rb".freeze, "lib/ollama_chat/tools.rb".freeze, "lib/ollama_chat/tools/browse.rb".freeze, "lib/ollama_chat/tools/compute_bmi.rb".freeze, "lib/ollama_chat/tools/concern.rb".freeze, "lib/ollama_chat/tools/copy_to_clipboard.rb".freeze, "lib/ollama_chat/tools/delete_file.rb".freeze, "lib/ollama_chat/tools/directory_structure.rb".freeze, "lib/ollama_chat/tools/eval_ruby.rb".freeze, "lib/ollama_chat/tools/execute_grep.rb".freeze, "lib/ollama_chat/tools/execute_ri.rb".freeze, "lib/ollama_chat/tools/file_context.rb".freeze, "lib/ollama_chat/tools/gem_path_lookup.rb".freeze, "lib/ollama_chat/tools/generate_image.rb".freeze, "lib/ollama_chat/tools/generate_password.rb".freeze, "lib/ollama_chat/tools/get_current_weather.rb".freeze, "lib/ollama_chat/tools/get_cve.rb".freeze, "lib/ollama_chat/tools/get_endoflife.rb".freeze, "lib/ollama_chat/tools/get_ghr.rb".freeze, "lib/ollama_chat/tools/get_jira_issue.rb".freeze, "lib/ollama_chat/tools/get_location.rb".freeze, "lib/ollama_chat/tools/get_rfc.rb".freeze, "lib/ollama_chat/tools/get_time.rb".freeze, "lib/ollama_chat/tools/get_url.rb".freeze, "lib/ollama_chat/tools/move_file.rb".freeze, "lib/ollama_chat/tools/open_file_in_editor.rb".freeze, "lib/ollama_chat/tools/paste_from_clipboard.rb".freeze, "lib/ollama_chat/tools/paste_into_editor.rb".freeze, "lib/ollama_chat/tools/patch_file.rb".freeze, "lib/ollama_chat/tools/read_file.rb".freeze, "lib/ollama_chat/tools/resolve_tag.rb".freeze, "lib/ollama_chat/tools/retrieve_document_snippets.rb".freeze, "lib/ollama_chat/tools/roll_dice.rb".freeze, "lib/ollama_chat/tools/run_tests.rb".freeze, "lib/ollama_chat/tools/search_web.rb".freeze, "lib/ollama_chat/tools/write_file.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/analyze_directory.rb".freeze, "lib/ollama_chat/utils/backup.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/json_jsonl_io.rb".freeze, "lib/ollama_chat/utils/path_completer.rb".freeze, "lib/ollama_chat/utils/path_validator.rb".freeze, "lib/ollama_chat/utils/png_metadata_extractor.rb".freeze, "lib/ollama_chat/utils/tag_resolver.rb".freeze, "lib/ollama_chat/utils/utf8_converter.rb".freeze, "lib/ollama_chat/utils/value_formatter.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/conversation.jsonl".freeze, "spec/assets/deep/deeper/empty.txt".freeze, "spec/assets/deep/deeper/not-empty.txt".freeze, "spec/assets/deep/empty.txt".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/fluffy.png".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/miyu.png".freeze, "spec/assets/pirateweather.json".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/database/models/favourite_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/information_spec.rb".freeze, "spec/ollama_chat/input_content_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/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/state_selectors_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/token_estimator_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/copy_to_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/delete_file_spec.rb".freeze, "spec/ollama_chat/tools/directory_structure_spec.rb".freeze, "spec/ollama_chat/tools/execute_grep_spec.rb".freeze, "spec/ollama_chat/tools/execute_ri_spec.rb".freeze, "spec/ollama_chat/tools/file_context_spec.rb".freeze, "spec/ollama_chat/tools/gem_path_lookup_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/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/retrieve_document_snippets_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_web_spec.rb".freeze, "spec/ollama_chat/tools/write_file_spec.rb".freeze, "spec/ollama_chat/utils/analyze_directory_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_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, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/command_concern.rb".freeze, "lib/ollama_chat/commands.rb".freeze, "lib/ollama_chat/config_handling.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/database.rb".freeze, "lib/ollama_chat/database/duplicatable.rb".freeze, "lib/ollama_chat/database/migrations.rb".freeze, "lib/ollama_chat/database/migrations/001_initial_schema.rb".freeze, "lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb".freeze, "lib/ollama_chat/database/migrations/005_add_context_format_to_sessions.rb".freeze, "lib/ollama_chat/database/models/favourite.rb".freeze, "lib/ollama_chat/database/models/model_options.rb".freeze, "lib/ollama_chat/database/models/prompt.rb".freeze, "lib/ollama_chat/database/models/session.rb".freeze, "lib/ollama_chat/database/session_locking.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/favourites_management.rb".freeze, "lib/ollama_chat/file_editing.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/http_handling.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/links_set.rb".freeze, "lib/ollama_chat/location_handling.rb".freeze, "lib/ollama_chat/logging.rb".freeze, "lib/ollama_chat/message.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/oc.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/pager.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/personae_management.rb".freeze, "lib/ollama_chat/prompt_handling.rb".freeze, "lib/ollama_chat/prompt_management.rb".freeze, "lib/ollama_chat/rag_handling.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/session_management.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/state_selectors.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/system_prompt_management.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/token_estimator.rb".freeze, "lib/ollama_chat/token_estimator/crude.rb".freeze, "lib/ollama_chat/tool_calling.rb".freeze, "lib/ollama_chat/tools.rb".freeze, "lib/ollama_chat/tools/browse.rb".freeze, "lib/ollama_chat/tools/compute_bmi.rb".freeze, "lib/ollama_chat/tools/concern.rb".freeze, "lib/ollama_chat/tools/copy_to_clipboard.rb".freeze, "lib/ollama_chat/tools/delete_file.rb".freeze, "lib/ollama_chat/tools/directory_structure.rb".freeze, "lib/ollama_chat/tools/eval_ruby.rb".freeze, "lib/ollama_chat/tools/execute_grep.rb".freeze, "lib/ollama_chat/tools/execute_ri.rb".freeze, "lib/ollama_chat/tools/file_context.rb".freeze, "lib/ollama_chat/tools/gem_path_lookup.rb".freeze, "lib/ollama_chat/tools/generate_image.rb".freeze, "lib/ollama_chat/tools/generate_password.rb".freeze, "lib/ollama_chat/tools/get_current_weather.rb".freeze, "lib/ollama_chat/tools/get_cve.rb".freeze, "lib/ollama_chat/tools/get_endoflife.rb".freeze, "lib/ollama_chat/tools/get_ghr.rb".freeze, "lib/ollama_chat/tools/get_jira_issue.rb".freeze, "lib/ollama_chat/tools/get_location.rb".freeze, "lib/ollama_chat/tools/get_rfc.rb".freeze, "lib/ollama_chat/tools/get_time.rb".freeze, "lib/ollama_chat/tools/get_url.rb".freeze, "lib/ollama_chat/tools/move_file.rb".freeze, "lib/ollama_chat/tools/open_file_in_editor.rb".freeze, "lib/ollama_chat/tools/paste_from_clipboard.rb".freeze, "lib/ollama_chat/tools/paste_into_editor.rb".freeze, "lib/ollama_chat/tools/patch_file.rb".freeze, "lib/ollama_chat/tools/read_file.rb".freeze, "lib/ollama_chat/tools/resolve_tag.rb".freeze, "lib/ollama_chat/tools/retrieve_document_snippets.rb".freeze, "lib/ollama_chat/tools/roll_dice.rb".freeze, "lib/ollama_chat/tools/run_tests.rb".freeze, "lib/ollama_chat/tools/search_web.rb".freeze, "lib/ollama_chat/tools/write_file.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/analyze_directory.rb".freeze, "lib/ollama_chat/utils/backup.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/json_jsonl_io.rb".freeze, "lib/ollama_chat/utils/path_completer.rb".freeze, "lib/ollama_chat/utils/path_validator.rb".freeze, "lib/ollama_chat/utils/png_metadata_extractor.rb".freeze, "lib/ollama_chat/utils/tag_resolver.rb".freeze, "lib/ollama_chat/utils/utf8_converter.rb".freeze, "lib/ollama_chat/utils/value_formatter.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
+  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "config/sherlock.md".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/command_concern.rb".freeze, "lib/ollama_chat/commands.rb".freeze, "lib/ollama_chat/config_handling.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/database.rb".freeze, "lib/ollama_chat/database/duplicatable.rb".freeze, "lib/ollama_chat/database/migrations.rb".freeze, "lib/ollama_chat/database/migrations/001_initial_schema.rb".freeze, "lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb".freeze, "lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb".freeze, "lib/ollama_chat/database/migrations/005_add_context_format_to_sessions.rb".freeze, "lib/ollama_chat/database/models/favourite.rb".freeze, "lib/ollama_chat/database/models/model_options.rb".freeze, "lib/ollama_chat/database/models/prompt.rb".freeze, "lib/ollama_chat/database/models/session.rb".freeze, "lib/ollama_chat/database/session_locking.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/favourites_management.rb".freeze, "lib/ollama_chat/file_editing.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/http_handling.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/links_set.rb".freeze, "lib/ollama_chat/location_handling.rb".freeze, "lib/ollama_chat/logging.rb".freeze, "lib/ollama_chat/message.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/oc.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/pager.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/personae_management.rb".freeze, "lib/ollama_chat/prompt_handling.rb".freeze, "lib/ollama_chat/prompt_management.rb".freeze, "lib/ollama_chat/rag_handling.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/session_management.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/state_selectors.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/system_prompt_management.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/token_estimator.rb".freeze, "lib/ollama_chat/token_estimator/crude.rb".freeze, "lib/ollama_chat/tool_calling.rb".freeze, "lib/ollama_chat/tools.rb".freeze, "lib/ollama_chat/tools/browse.rb".freeze, "lib/ollama_chat/tools/compute_bmi.rb".freeze, "lib/ollama_chat/tools/concern.rb".freeze, "lib/ollama_chat/tools/copy_to_clipboard.rb".freeze, "lib/ollama_chat/tools/delete_file.rb".freeze, "lib/ollama_chat/tools/directory_structure.rb".freeze, "lib/ollama_chat/tools/eval_ruby.rb".freeze, "lib/ollama_chat/tools/execute_grep.rb".freeze, "lib/ollama_chat/tools/execute_ri.rb".freeze, "lib/ollama_chat/tools/file_context.rb".freeze, "lib/ollama_chat/tools/gem_path_lookup.rb".freeze, "lib/ollama_chat/tools/generate_image.rb".freeze, "lib/ollama_chat/tools/generate_password.rb".freeze, "lib/ollama_chat/tools/get_current_weather.rb".freeze, "lib/ollama_chat/tools/get_cve.rb".freeze, "lib/ollama_chat/tools/get_endoflife.rb".freeze, "lib/ollama_chat/tools/get_ghr.rb".freeze, "lib/ollama_chat/tools/get_jira_issue.rb".freeze, "lib/ollama_chat/tools/get_location.rb".freeze, "lib/ollama_chat/tools/get_rfc.rb".freeze, "lib/ollama_chat/tools/get_time.rb".freeze, "lib/ollama_chat/tools/get_url.rb".freeze, "lib/ollama_chat/tools/move_file.rb".freeze, "lib/ollama_chat/tools/open_file_in_editor.rb".freeze, "lib/ollama_chat/tools/paste_from_clipboard.rb".freeze, "lib/ollama_chat/tools/paste_into_editor.rb".freeze, "lib/ollama_chat/tools/patch_file.rb".freeze, "lib/ollama_chat/tools/read_file.rb".freeze, "lib/ollama_chat/tools/resolve_tag.rb".freeze, "lib/ollama_chat/tools/retrieve_document_snippets.rb".freeze, "lib/ollama_chat/tools/roll_dice.rb".freeze, "lib/ollama_chat/tools/run_tests.rb".freeze, "lib/ollama_chat/tools/search_web.rb".freeze, "lib/ollama_chat/tools/write_file.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/analyze_directory.rb".freeze, "lib/ollama_chat/utils/backup.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/json_jsonl_io.rb".freeze, "lib/ollama_chat/utils/path_completer.rb".freeze, "lib/ollama_chat/utils/path_validator.rb".freeze, "lib/ollama_chat/utils/png_metadata_extractor.rb".freeze, "lib/ollama_chat/utils/tag_resolver.rb".freeze, "lib/ollama_chat/utils/utf8_converter.rb".freeze, "lib/ollama_chat/utils/value_formatter.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/conversation.jsonl".freeze, "spec/assets/deep/deeper/empty.txt".freeze, "spec/assets/deep/deeper/not-empty.txt".freeze, "spec/assets/deep/empty.txt".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/fluffy.png".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/miyu.png".freeze, "spec/assets/pirateweather.json".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/database/models/favourite_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/information_spec.rb".freeze, "spec/ollama_chat/input_content_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/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/state_selectors_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/token_estimator_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/copy_to_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/delete_file_spec.rb".freeze, "spec/ollama_chat/tools/directory_structure_spec.rb".freeze, "spec/ollama_chat/tools/execute_grep_spec.rb".freeze, "spec/ollama_chat/tools/execute_ri_spec.rb".freeze, "spec/ollama_chat/tools/file_context_spec.rb".freeze, "spec/ollama_chat/tools/gem_path_lookup_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/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/retrieve_document_snippets_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_web_spec.rb".freeze, "spec/ollama_chat/tools/write_file_spec.rb".freeze, "spec/ollama_chat/utils/analyze_directory_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_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, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   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]

data/spec/ollama_chat/source_fetching_spec.rb

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

data/spec/ollama_chat/tools/retrieve_document_snippets_spec.rb

@@ -201,8 +201,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     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)
+    allow(chat).to receive(:generate).with(prompt: anything).and_return('1')
 
     result = tool.execute(tool_call, chat:)
     json = json_object(result)
@@ -239,8 +238,7 @@ describe OllamaChat::Tools::RetrieveDocumentSnippets do
     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)
+    allow(chat).to receive(:generate).with(prompt: anything).and_return('0')
 
     result = tool.execute(tool_call, chat:)
     json = json_object(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.96
+  version: 0.0.97
 platform: ruby
 authors:
 - Florian Frank
@@ -478,6 +478,7 @@ extra_rdoc_files:
 - lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb
 - lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb
 - lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb
+- lib/ollama_chat/database/migrations/005_add_context_format_to_sessions.rb
 - lib/ollama_chat/database/models/favourite.rb
 - lib/ollama_chat/database/models/model_options.rb
 - lib/ollama_chat/database/models/prompt.rb
@@ -598,6 +599,7 @@ files:
 - lib/ollama_chat/database/migrations/002_add_links_to_sessions.rb
 - lib/ollama_chat/database/migrations/003_add_history_to_sessions.rb
 - lib/ollama_chat/database/migrations/004_add_profile_to_model_options.rb
+- lib/ollama_chat/database/migrations/005_add_context_format_to_sessions.rb
 - lib/ollama_chat/database/models/favourite.rb
 - lib/ollama_chat/database/models/model_options.rb
 - lib/ollama_chat/database/models/prompt.rb