ollama_chat 0.0.125 → 0.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de94c682281a4667e89feee589883bd33acf082165f37ce443072117a773167
-  data.tar.gz: 94cccbb92af48198a70879cf1028a0aebfe0cda49e25ccd82352cb35d9054bf7
+  metadata.gz: a72761f0d0b34c0ba21859589410e914dda692d669a39629e4e6bb8f6e2857ea
+  data.tar.gz: 374fa95c62c5510e94c6a7624200a6193a15e9ed842a4b49b5364d43eeecac52
 SHA512:
-  metadata.gz: d3bad30e34ad309fe6c2f2263802af2778eded9459affc6c6713c6383f58706fe54411e7a4b6f087c487718d0a6ea8e07e90dfed22ca1a64b563d207ce61287e
-  data.tar.gz: 8f9befaa4a6a519b8f7b4424f0d16380663b863e039f08142fc667b01ecb83aa989b9e635ea5373b22191c7ba8f568e97dd210d732d1d6d5099dd3e5cffb74ee
+  metadata.gz: ea024b4607101da7037f0234970cb6e655c6d2b1af46fc1eac1b8dc901aebd5ef95a091d079653bfb58e86d381c4bb56173172f9fb0861e9d8a3424667bfdd32
+  data.tar.gz: dfbbe6cddbb4aac1f047cb39719ed58e8920e22a42775cb9f18a4d3731d0c53cc7c632733241f58f6cd6c132e5979b0a3117bf38e7e0095417310e839fb7421b

data/CHANGES.md

@@ -1,5 +1,157 @@
 # Changes
 
+## 2026-10-06 v0.0.127
+
+## Changes
+
+*   **Switches and Configuration**
+    *   Added `memory_trigger` switch, registered in `/toggle` (regexp,
+        completion list, help string, and fallback feedback).
+    *   Refactored `Switch` to accept callable values alongside plain values;
+        plain values are now wrapped via a new private `adhoc_closure` method
+        using a `UNSET` sentinel for read/write disambiguation.
+    *   Hardened `Switch#initialize` with an arity guard: callable values
+        responding to `:arity` must return `-1` (optional single parameter
+        defaulting to `UNSET`), otherwise a `TypeError` is raised.
+    *   Updated `set` methods in `OllamaChat::Switches` to explicitly return
+        `nil` for consistent behavior.
+    *   Added `@raise [TypeError]` tag to `Switch#initialize` and expanded
+        `@param value` YARD documentation for `CombinedSwitch`.
+    *   Added arity guard (`ask_and_send(:arity) <= 0`) to
+        `CombinedSwitch#initialize`.
+
+*   **Session and Model Updates**
+    *   Added `trigger_enabled?` and `set_trigger_enabled` to the `Session`
+        model to encapsulate trigger hash shape.
+    *   Added YARD documentation for `adhoc_closure` and the `:memory_trigger`
+        reader.
+
+*   **Conversation and Compaction**
+    *   Added `/conversation compact summary` command.
+    *   Introduced `show_compaction_summary` in `Compaction` to retrieve the
+        most recent summary message via `messages.find_summary` and render its
+        content (narrative + `tool_calls` lookup index) through the pager,
+        prefixed with a size header and entry count.
+    *   Registered the new `compact summary` subcommand in the `/conversation`
+        regexp alternation, completion list, help text, and dispatch block.
+    *   Excluded system-injected messages (`runtime_information`,
+        `trigger_inject`) from the compaction summary's `tool_calls` block to
+        keep the index focused on user-initiated tool calls.
+
+*   **RAG and Search**
+    *   Moved `set_documents_collection` above the `private` keyword in
+        `rag_handling.rb` to make it callable from outside `RAGHandling`.
+    *   Updated `choose_collection` to call `set_documents_collection` instead
+        of assigning `@documents.collection` directly.
+    *   Replaced direct `chat.documents.collection` reads/writes in `chat.rb`
+        and `search_knowledge.rb` with public accessors `chat.collection` and
+        `chat.set_documents_collection`.
+    *   Consolidated two `chat.log` calls in `search_knowledge.rb` into one,
+        adding `rerank:` and `pre_rerank:` to the structured data hash with
+        `.compact`.
+    *   Removed `String#%` interpolation in the old rerank log line and
+        eliminated the `collection_name` local variable.
+    *   Updated `trigger_inject` in `collection_search.rb` to include the
+        surviving `records` array (text, similarity, tags) in the log `data:`
+        hash instead of only logging the count.
+
+*   **Shell Execution**
+    *   Forced pager for all `execute_shell` output by passing `force: true` to
+        `use_pager`, ensuring consistent UX with other pager-based tools.
+    *   Updated test-mode spec examples to include a `stub_success` call with
+        sample stdout to exercise the always-active pager path with real
+        content.
+
+## 2026-10-05 v0.0.126
+
+*   **Tool Registry Refactor**: Refactored the tool registry to store tool
+    classes instead of pre-built instances.
+    *   `registered_class(name)` now returns the class for `summary_template`
+        access.
+    *   `registered_tool(name, chat:)` instantiates a fresh instance bound to
+        the current session.
+    *   `Concern#initialize(chat)` injects the chat reference; all tools now
+        access config via `self.chat` instead of `opts[:chat]`.
+    *   Helper methods in `execute_shell`, `generate_image`,
+        `get_current_weather`, `get_ghr`, and `patch_file` now use `self.chat`
+        directly.
+    *   Migrated all tool specs to use `described_class.new(chat)` and
+        `.execute(tool_call)`.
+
+*   **Path Allowlists**: Moved path allowlists into tool parameter
+    descriptions.
+    *   Added `allowed_paths` to `tools/concern.rb` to return expanded,
+        existing paths for the calling tool's `allowed` config.
+    *   Removed `tool_paths_allowed` from `tool_calling.rb` and its spec.
+    *   Injected `allowed_paths.map(&:inspect).join(', ')` into the `path`,
+        `source`, and `destination` parameter descriptions of `delete_file`,
+        `move_file`, `patch_file`, `read_file`, and `write_file`.
+
+*   **RAG Handling & Runtime Info**: Relocated `collection_descriptions` from
+    `information.rb` to `rag_handling.rb`.
+    *   Removed `collections` key from `static_runtime_information_values` and
+        `default_config.yml`.
+    *   Migrated `static_runtime_information` and `dynamic_runtime_information`
+        from `String#%` to `named_placeholders_interpolate`.
+
+*   **Collection Commands**: Reworked collection clearing into three distinct
+    commands.
+    *   Split monolithic `clear_collection` into `clear_whole_collection`,
+        `clear_collection_tags`, and `clear_collection_sources`.
+    *   `clear_collection_tags` implements a two-level tag-to-source browser.
+    *   `clear_collection_sources` implements a source-to-tags browser.
+    *   Added `use_pager(force:)` keyword in `pager.rb` to bypass size checks
+        using `Float::INFINITY`.
+    *   Added `Kramdown::ANSI::Width.wrap(..., percentage: 90)` to pager views
+        for terminal-width wrapping.
+    *   Bumped `documentrix` minimum to **0.8.0** in `Rakefile` and
+        `ollama_chat.gemspec` for the new `records(tags:, sources:)` API.
+    *   Extended `/collection` regexp and completion for `clear sources`.
+
+*   **Memory Tools**: Enhanced memory management tools.
+    *   `memorize` now accepts an optional `update` kwarg (ISO timestamp tag)
+        to replace an existing memory entry, returning `replaced_timestamp` and
+        `replaced_text`.
+    *   `forget` now returns `forgotten_text` in the JSON response and includes
+        an 80-character snippet in the human-readable `message`.
+    *   Renamed `set_current_collection` to `set_documents_collection` in
+        `rag_handling.rb`, `session_management.rb`, and specs.
+    *   Made `current_collection` public in `RAGHandling`.
+    *   Enriched `search_knowledge` tool `collection` param with allowed
+        collections from `collection_descriptions` and current default.
+
+*   **Session Management**:
+    *   Derive memory trigger from persona at session apply by adding a
+        `trigger` block to `default_config.yml`.
+    *   Extracted `create_memory_collection` into `RAGHandling` as the single
+        canonical entry point.
+    *   In `SessionManagement#session_apply`, auto-derive the session trigger
+        from `initial_persona_name` and `config.trigger` when no explicit
+        trigger is set.
+    *   Advertise `C-u` random shortcut in the session prompt to clear prefill
+        and obtain a random session name.
+
+*   **Commands & UX**:
+    *   Added `-r` flag to `/compose` to quote the last assistant reply as an
+        `edit_text` pre-fill.
+    *   Removed the `confirm?` prompt before `compact_with_retry` in
+        `/conversation compact`; compaction now runs immediately.
+    *   Split `/collection clear` into `clear tags` subcommand and bare `clear`
+        routing to `clear_whole_collection`.
+
+*   **Tool Descriptions & Logging**:
+    *   Made `paste_into_editor` description imperative.
+    *   Documented bottom-up edit order in `patch_file` to prevent models from
+        incorrectly compensating for line shifts.
+    *   Log full `edits` array in `patch_file` tool info log payload instead of
+        just `edits_count`.
+    *   Strip ANSI codes from `run_tests` captured output using
+        `OllamaChat::Utils::StripANSI`.
+
+*   **Compatibility & Fixes**:
+    *   Include `persona_name` in the `default` system prompt template in
+        `default_config.yml`.
+
 ## 2026-10-03 v0.0.125
 
 ### Added

data/Rakefile

@@ -40,7 +40,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.23'
-  dependency             'documentrix',           '>= 0.7.0'
+  dependency             'documentrix',           '>= 0.8.0'
   dependency             'unix_socks',            '>= 0.4'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/lib/ollama_chat/chat.rb

@@ -712,7 +712,7 @@ class OllamaChat::Chat
   # @note Progress is reported to STDOUT during processing
   def add_documents_from_argv(document_list)
     if document_list.any?(&:empty?)
-      feedback("Clearing collection #{bold{documents.collection}}.", type: :info)
+      feedback("Clearing collection #{bold{collection}}.", type: :info)
       documents.clear
       document_list.reject!(&:empty?)
     end
@@ -724,7 +724,7 @@ class OllamaChat::Chat
           File.expand_path(doc)
         end
       end
-      feedback("Collection #{bold{documents.collection}}: Adding #{document_list.size} documents…", type: :info)
+      feedback("Collection #{bold{collection}}: Adding #{document_list.size} documents…", type: :info)
       count = 1
       document_list.each_slice(25) do |docs|
         docs.each do |doc|

data/lib/ollama_chat/collection_search.rb

@@ -130,8 +130,20 @@ module OllamaChat::CollectionSearch
       records.empty? and return
       pre_rerank = records.size
       records    = rerank_records(content, records, prompt_name:)
-      log(:info, 'Trigger: %d/%d passed rerank for %s' % [ records.size, pre_rerank, collection ],
-          data: { collection:, prompt_name: })
+      log(
+        :info,
+        'Trigger: %d/%d passed rerank for %s' % [ records.size, pre_rerank, collection ],
+        data: {
+          collection:,
+          prompt_name:,
+          records: records.map { |r|
+            {
+              text:       r.text,
+              similarity: r.similarity&.round(4),
+              tags:       r.tags_set.to_s(link: false)
+            }
+          }
+        })
       records.empty? and return
     end
     snippets = records.map { |record|

data/lib/ollama_chat/commands.rb

@@ -161,13 +161,13 @@ module OllamaChat::Commands
 
   command(
     name: :toggle,
-    regexp: %r(^/toggle(?:\s+(markdown|stream|location|runtime_info|voice|think_loud|think_strip|embedding)(?:\s+(-[yn]))?)?$),
-    complete: [ 'toggle', %w[ markdown stream location runtime_info voice think_loud think_strip embedding ] ],
+    regexp: %r(^/toggle(?:\s+(markdown|stream|location|runtime_info|voice|think_loud|think_strip|embedding|memory_trigger)(?:\s+(-[yn]))?)?$),
+    complete: [ 'toggle', %w[ markdown stream location runtime_info voice think_loud think_strip embedding memory_trigger ] ],
     options: '[-y|-n]',
     help: <<~EOT
       🎛️ Toggle feature switches
-      (markdown, stream, location, runtime_info,
-      voice, think_loud, think_strip, embedding)
+       (markdown, stream, location, runtime_info,
+       voice, think_loud, think_strip, embedding, memory_trigger)
       Options: -y (on), -n (off)
     EOT
   ) do |toggle_name, flag|
@@ -191,7 +191,7 @@ module OllamaChat::Commands
       end
     else
       feedback(
-        "Available toggles: markdown|stream|location|runtime_info|voice|think_loud|think_strip|embedding"
+        "Available toggles: markdown|stream|location|runtime_info|voice|think_loud|think_strip|embedding|memory_trigger"
       )
     end
     :next
@@ -391,14 +391,15 @@ module OllamaChat::Commands
 
   command(
     name: :conversation,
-    regexp: %r(^/conversation\s+(clean|compact|save|load|summarize|report)((?:\s+-[sc])*)(?:\s+([^-].*\.jsonl?))?$),
-    complete: [ 'conversation', %w[ save load clean compact summarize report ] ],
+    regexp: %r(^/conversation\s+(clean|compact summary|compact|save|load|summarize|report)((?:\s+-[sc])*)(?:\s+([^-].*\.jsonl?))?$),
+    complete: [ 'conversation', %w[ compact clean report compact\ summary summarize save load ] ],
     options: '[-s|-c] [FILENAME]',
     help: <<~EOT
       💾 Manage conversation content:
          - save/load: Export/import as .json or .jsonl
          - clean: Remove tool content, images, thinking
          - compact: Summarize old messages, keep recent
+         - compact summary: Show last compaction summary
          - summarize: Per-message narrative (-s sentence)
          - report: Generate a session report document
     EOT
@@ -426,16 +427,10 @@ module OllamaChat::Commands
       else
         feedback("Denied.", type: :denied)
       end
+    when 'compact summary'
+      show_compaction_summary
     when 'compact'
-      if confirm?(
-          prompt: '🔔 Compact conversation? Old messages will be summarized. (y/n) ',
-          yes: /\Ay/i
-        )
-      then
-        compact_with_retry
-      else
-        feedback("Denied.", type: :denied)
-      end
+      compact_with_retry
     when 'summarize'
       opts = go_command('s', opts)
       summarize_conversation(sentence: opts[?s])
@@ -648,12 +643,12 @@ module OllamaChat::Commands
 
   command(
     name: :collection,
-    regexp: %r(^/collection(?:\s+(change|clear|list|rename|update(?: all)?|new|edit|delete|query))?((?:\s+-[er])*)?$),
-    complete: [ 'collection', %w[ change clear list rename update update\ all new edit delete query ] ],
+    regexp: %r(^/collection(?:\s+(change|clear(?: (?:tags|sources))?|list|rename|update(?: all)?|new|edit|delete|query))?((?:\s+-[er])*)?$),
+    complete: [ 'collection', %w[ change clear\ tags clear\ sources clear list rename update update\ all new edit delete query ] ],
     optional: true,
     help: <<~EOT
       📚 Manage RAG collections:
-         - change/clear/list/rename
+          - change/clear/clear tags/clear sources/list/rename
          - update: Re-index modified docs
          - update all: Re-index all collections
          - new: Interactively create a new collection
@@ -665,7 +660,11 @@ module OllamaChat::Commands
   ) do |subcommand, opts|
     case subcommand
     when 'clear'
-      clear_collection
+      clear_whole_collection
+    when 'clear tags'
+      clear_collection_tags
+    when 'clear sources'
+      clear_collection_sources
     when 'change'
       choose_collection(collection)
     when 'list'
@@ -829,12 +828,23 @@ module OllamaChat::Commands
 
   command(
     name: :compose,
-    regexp: %r(^/compose$),
+    regexp: %r(^/compose(\s+-r)?\s*$),
+    options: '[-r]',
     help: <<~EOT
       \u270D  Compose message in external editor
+         Options: -r pre-fill with quoted last assistant reply
     EOT
-  ) do
-    edit_text.full? or :next
+  ) do |opts|
+    opts = go_command('r', opts)
+    prefill = if opts[?r]
+      if msg = messages.find_last(content: true) { !_1.tool? && _1.role == 'assistant' }
+        msg.content.to_s.lines.map { "> #{_1}" }.join + "\n\n"
+      else
+        feedback('No assistant message to quote.', type: :warn)
+        next :next
+      end
+    end
+    edit_text(prefill).full? or :next
   end
 
   command(

data/lib/ollama_chat/compaction.rb

@@ -21,7 +21,7 @@ module OllamaChat::Compaction
     # @return [String] a short natural-language description of the call.
     def tool_summary_line(tool_name, result)
       default_summary = "was called."
-      klass           = OllamaChat::Tools.registered[tool_name.to_s]&.class
+      klass           = OllamaChat::Tools.registered_class(tool_name)
       klass&.summary_template(result:) || default_summary
     rescue StandardError
       default_summary
@@ -134,6 +134,33 @@ module OllamaChat::Compaction
     false
   end
 
+  # Displays the most recent compaction summary in the pager.
+  #
+  # Shows the narrative and the tool-call lookup index (the
+  # `lookup_group` entries with short UUIDs) carried in the summary
+  # message, prefixed with size metadata.
+  #
+  # @return [nil] always returns nil (command block handles :next).
+  def show_compaction_summary
+    unless msg = messages.find_summary
+      feedback('No compaction summary yet.', type: :info)
+      return
+    end
+    es = OllamaChat::TokenEstimator.estimate(msg.content.to_s)
+    use_pager do |output|
+      output.puts <<~EOT
+        #{bold{'Compaction Summary'}}
+        #{'─' * Tins::Terminal.columns}
+
+        #{kramdown_ansi_parse(msg.content.to_s)}
+
+        #{'─' * Tins::Terminal.columns}
+        Size:   👾#{es.bytes_formatted} 🧩#{es.tokens_formatted}
+        Tools:  #{msg.tool_calls&.size || 0} lookup_group entries
+      EOT
+    end
+  end
+
   private
 
   # Serializes non-system messages into a readable block for the prompt.
@@ -172,7 +199,7 @@ module OllamaChat::Compaction
   def build_tool_entries(messages)
     messages.filter_map do |msg|
       next unless tool_name = msg.tool_name.full?
-      next if tool_name == 'runtime_information'
+      next if %w[ runtime_information trigger_inject ].include?(tool_name)
       uuid = msg.group_uuid.to_s[-8..]
       summary = OllamaChat::Compaction.tool_summary_line(
         tool_name, msg.content.to_s

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

@@ -65,6 +65,27 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
     messages.to_s.count(?\n)
   end
 
+  # Returns the `enabled` flag of the first configured trigger entry.
+  #
+  # @return [Boolean, nil] true when the trigger is active, false when
+  #   explicitly disabled, nil when no trigger is configured
+  def trigger_enabled?
+    trigger&.values&.first&.[]('enabled')
+  end
+
+  # Sets the `enabled` flag of the first configured trigger entry and
+  # persists the change.
+  #
+  # No-op when no trigger is configured.
+  #
+  # @param value [Boolean] the new enabled state
+  def set_trigger_enabled(value)
+    if hash = trigger&.values&.first
+      hash['enabled'] = value
+      save
+    end
+  end
+
   # @!attribute [v] id
   #   @return [Integer] The primary key for the session.
   #

data/lib/ollama_chat/follow_chat.rb

@@ -180,7 +180,7 @@ class OllamaChat::FollowChat
         feedback(
           ("\n%s Execution of tool %s confirmed.\n\n" % [ symbol, bold { name } ])
         )
-        result = OllamaChat::Tools.registered[name].execute(tool_call, chat:)
+        result = OllamaChat::Tools.registered_tool(name, chat:).execute(tool_call)
         chat.log(:info, "Tool execution confirmed", data: { tool: name, confirmed: })
       end
 

data/lib/ollama_chat/information.rb

@@ -327,22 +327,6 @@ module OllamaChat::Information
     config.infobar.message.to_h
   end
 
-  # Retrieves a hash of collection names and their descriptions from the
-  # database.
-  #
-  # This is used to provide context to the AI model about available RAG
-  # collections.
-  #
-  # @return [Hash{String => String}] a hash mapping collection names to their
-  #   descriptions
-  def collection_descriptions
-    cols = models::Collection.where(enabled: true)
-      .select(:name, :description).order(:name)
-    cols.each_with_object({}) do |c, hash|
-      hash[c.name] = c.description
-    end
-  end
-
   # Generates a hash containing static runtime information.
   #
   # This method collects session-level constants including the user,
@@ -353,11 +337,9 @@ module OllamaChat::Information
   def static_runtime_information_values
     {
       client:               ,
-      collections:          JSON.pretty_generate(collection_descriptions),
       current_directory:    Pathname.pwd.expand_path.to_path,
       languages:            config.languages * ', ',
       location:             location.on?.full? { location_description } || 'n/a',
-      tool_paths_allowed:   JSON.pretty_generate(tool_paths_allowed),
       user:                 ,
     }
   end
@@ -369,7 +351,9 @@ module OllamaChat::Information
   #
   # @return [String] a formatted static runtime information string.
   def static_runtime_information
-    prompt(:static_runtime_info).to_s % static_runtime_information_values
+    prompt(:static_runtime_info).to_s.named_placeholders_interpolate(
+      static_runtime_information_values
+    )
   end
 
   # Returns a formatted string representing the estimated text length of
@@ -423,7 +407,9 @@ module OllamaChat::Information
   #
   # @return [String] the formatted dynamic runtime information string.
   def dynamic_runtime_information
-    prompt(:dynamic_runtime_info).to_s % dynamic_runtime_information_values
+    prompt(:dynamic_runtime_info).to_s.named_placeholders_interpolate(
+      dynamic_runtime_information_values
+    )
   end
 
   # Injects the current dynamic runtime information (the "heartbeat")

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -56,8 +56,6 @@ prompts:
       - Location: %{location}
       - Current directory is "%{current_directory}"
       - Client is %{client}.
-      - These tools have access to these allowed paths: %{tool_paths_allowed}
-      - Search in these collections with `search_knowledge`: %{collections}
     dynamic_runtime_info: |
       There is usually no reason to mention this information to the user unless
       asked about it.
@@ -424,7 +422,7 @@ prompts:
       To see the full output of any tool call above, use lookup_group
       with the group UUID in parentheses.
   system:
-    default: <%= OC::OLLAMA::CHAT::SYSTEM || "%{persona}\n\n%{runtime_info}".inspect %>
+    default: <%= OC::OLLAMA::CHAT::SYSTEM || "`persona_name`: %{persona_name}\n\n%{persona}\n\n%{runtime_info}".inspect %>
     persona: |
       `persona_name`: %{persona_name}
 
@@ -497,6 +495,10 @@ document_policy: importing
 persona:
   # Basename (without .md) of the default persona file in the personae directory.
   default_name: personal_assistant
+trigger:
+  enabled: true
+  prompt_name: memory_rerank
+  text_count: 3
 parsing:
   directory_structure_max_depth: 1
 think:

data/lib/ollama_chat/pager.rb

@@ -12,14 +12,17 @@ module OllamaChat::Pager
   # If the output would exceed the terminal's line capacity, it pipes the content
   # through an appropriate pager command (like 'less' or 'more').
   #
+  # @param force [Boolean] bypass the line-count threshold and always
+  #   invoke the pager, regardless of output length.
   # @yield A block that yields an IO object to write output to
   # @yieldparam [IO] the IO object to write to
-  def use_pager
+  def use_pager(force: false)
     command       = determine_pager_command
     output_buffer = StringIO.new
     yield output_buffer
     buffer = output_buffer.string
-    Kramdown::ANSI::Pager.pager(command:, lines: buffer.count(?\n)) do |output|
+    lines  = force ? Float::INFINITY : buffer.count(?\n)
+    Kramdown::ANSI::Pager.pager(command:, lines:) do |output|
       output.puts buffer
     end
   end