ollama_chat 0.0.124 → 0.0.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2664dce7c6742ff5c950e64330b84325bcbb573467edde9aceddc3fa209641
-  data.tar.gz: 87baa515acb398c9da1b7cf6c7fce173d946e4bd4d79ad0f1eb9dfbd2526235a
+  metadata.gz: 93612bbed949bff6bad6cf89f581b324165c0aa672f6f92b675b63a6a2dce7e0
+  data.tar.gz: 79aac9f7dada8df87035af5bdfd2913d16012af44a781b7a20c44a457163b313
 SHA512:
-  metadata.gz: a091addc87c893f700f405147386dc8fe8fcc5c3134ad12bb1ffda570ec8a0f64ac4acbaeaed70116a6c61d0765e14e2f085fa8d2c0b98496fb0881a56fdb0f8
-  data.tar.gz: 6d078a9c69b50719dda02e9c81a32d51929627ab6e50c7cae023630543e717dd2c1a86166495f339875178108e0ded60f9f451ebbec1275f16f06771c9b1b215
+  metadata.gz: 2eb715b50338ddb686e6aab7debd264591e1018216adef57146237a862a5f37f217a31bb481a724b4bb8fcc99144c1a40679e3048c64cb88f0eaaabd546661fc
+  data.tar.gz: 8fa30b91ba125939cd506078bcaf6c9549bb43aa6323f9186e0acae218c7814fd8add54aa75b39f907d4affc78889c52a45b2479ec57c4218d76e61e67843ed3

data/CHANGES.md

@@ -1,5 +1,182 @@
 # Changes
 
+## 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
+
+* Session-scoped trigger injection mechanism:
+  * New migration `011_add_trigger_to_sessions` adding a `:text` JSON column to
+    `sessions`.
+  * `Session#trigger` attribute with `plugin :serialization, :json` and `nil`
+    default.
+  * `CollectionSearch#trigger_inject` dispatch logic including embedding
+    guards, collection switching, document finding, and reranking.
+  * New `/session trigger edit` command registered in `commands.rb`.
+  * `edit_session_trigger` method in `session_management.rb` supporting dual
+    chooser and prefill.
+  * Trigger configuration display (⚡ block) added to `info_rag` in
+    `information.rb`.
+  * `runtime_information_inject` extracted from `chat.rb` into
+    `information.rb`.
+  * New prompt contexts: `prompts.rerank` (`default`, `memory_rerank`,
+    `lorebook_rerank`), `prompts.prompt.snippets_retrieval`, and
+    `prompts.prompt.snippets_trigger`.
+  * `persona_name` line added to `prompts.system.persona`.
+  * `TagResult` changed from `Data.define` to `Struct.new` to allow mutable
+    fields.
+  * `∅` fallback for empty patterns in `collection_stats`.
+  * Info-level logging for embedding requests/responses and rerank survivors in
+    `collection_search.rb`.
+  * New spec file `collection_search_spec.rb` with 7 examples for
+    `#trigger_inject`.
+
+### Changed
+
+* `SessionLocking#lock?` now accepts a required `chat:` keyword argument to
+  decouple feedback delegation from the host object.
+* `search_knowledge.rb` updated to use `snippets_retrieval` DB prompt,
+  `collection` block, and `database_collection?` guard.
+* `@embedding` instance variable swept to `embedding` accessor in
+  `information.rb`, `source_fetching.rb`, and `web_searching.rb`.
+* `Tins::Duration#format` used for compaction voice timing in
+  `report_compaction`, replacing `%.1f seconds`.
+* `tins` dependency bumped from `~> **1.58**` to `~> **1.60**` to support
+  unpadded `%H`, `%M`, and `%u` directives.
+* `resolve_tag_spec.rb` updated to replace an unreachable rescue-path test with
+  a "tagged file does not exist" test.
+* `search_knowledge_spec.rb` updated for new prompt names, `collection` block,
+  and `tags_set` doubles.
+* `compaction_spec.rb` regex updated to match the new duration format.
+* `Tins::GO.go` flag string reordered in `bin/ollama_chat_log`.
+
+### Fixed
+
+* Spec expectations in `session_management_spec.rb`, `parsing_spec.rb`, and
+  `source_fetching_spec.rb` updated to use Ruby 3.1+ hash shorthand `chat:`.
+
+### Tests
+
+* Added specs for `CommandConcern` class methods:
+  * `help_message` via `OllamaChat::Commands`: table structure, category
+    headers, pattern filtering, subcommand expansion, and optional/mandatory
+    asterisks.
+  * `command_completions`: array shape, bare names, subcommand variants, and
+    sort order.
+  * `Command` class: `execute_if_match?` (match, captures, nil-regexp path,
+    no-context error), `completions` (product, optional bare, strict),
+    `command_names`, and `optional?`.
+  * Duplicate registration guard against the real `:copy` entry in
+    `OllamaChat::Commands`.
+* Added specs for remaining command dispatch gaps:
+  * `/paste -i` stdin path via `paste_from_stdin`.
+  * `/last -v` voice output via `speak_last`.
+  * `/regenerate` success path (drop + return content).
+  * `/prompt delete` routes to `choose_and_delete_prompt`.
+  * `/web` without explicit count passes `nil`.
+  * `/character` JSON success paths: `info` (pager), `load` (raw content),
+    `import` (delegation).
+  * `/character` PNG `load` with `PNGMetadataExtractor`.
+* Added specs for `SessionManagement#edit_session_trigger`:
+  * Setting trigger from `nil` to a configured hash with `enabled`,
+    `prompt_name`, and `text_count`.
+  * Updating config for an already-configured collection.
+  * Switching the trigger to a different collection name.
+* Added specs for session model options and trigger edit:
+  * `/session model options` delegates to `edit_session_model_options` and
+    returns `:next`.
+  * `/session trigger edit` delegates to `edit_session_trigger` and returns
+    `:next`.
+
 ## 2026-10-02 v0.0.124
 
 ### 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'
@@ -49,7 +49,7 @@ GemHadar do
   dependency             'reverse_markdown',      '~> 3.0'
   dependency             'kramdown-ansi',         '~> 0.5'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
-  dependency             'tins',                  '~> 1.58'
+  dependency             'tins',                  '~> 1.60'
   dependency             'search_ui',             '>= 0.2'
   dependency             'amatch',                '~> 0.4'
   dependency             'pdf-reader',            '~> 2.0'

data/bin/ollama_chat_log

@@ -4,7 +4,7 @@ require 'ollama_chat'
 require 'file/tail'
 require 'tins/xt'
 
-opts     = Tins::GO.go 'fm:n:h:', defaults: { ?n => 10  }
+opts     = Tins::GO.go 'hfm:n:', defaults: { ?n => 10  }
 log_path = ARGV.shift || OC::OLLAMA::CHAT::LOG::CHAT
 
 if opts[?h]

data/lib/ollama_chat/chat.rb

@@ -314,10 +314,11 @@ class OllamaChat::Chat
   #   instance when a background thread was spawned (so callers can call
   #   `cancel_speaking`), or `nil` for inline playback or when voice is off
   def speak(text, background: true)
+    session or return
     voice.on? or return
-    voice = session.current_voice.full? or return
+    current_voice = session.current_voice.full? or return
     voice_handler.method_defined?(:speak) or return
-    voice_handler.new(chat: self, voice:).speak(text, background:)
+    voice_handler.new(chat: self, voice: current_voice).speak(text, background:)
   end
 
   # Returns a human-readable string representation of the Chat object,
@@ -553,17 +554,8 @@ class OllamaChat::Chat
           group_uuid:
         )
 
-        if runtime_info.on?
-          tool_name = 'runtime_information'
-          messages << OllamaChat::Message.new(
-            role:        'user',
-            tool_name:   ,
-            sender_name: tool_name,
-            content:     dynamic_runtime_information,
-            images:      @images.dup,
-            group_uuid:
-          )
-        end
+        runtime_information_inject(group_uuid:)
+        trigger_inject(content, group_uuid:)
       end
       @images.clear
       handler = OllamaChat::FollowChat.new(

data/lib/ollama_chat/collection_search.rb

@@ -24,14 +24,37 @@ module OllamaChat::CollectionSearch
     tags = Documentrix::Utils::Tags.new(
       tags, valid_tag: /\A#*([-\w.\]\[]+)/
     )
-    @documents.find_where(
-      query.first(config.embedding.model.context_length),
+    effective_query  = query.first(
+      config.embedding.model.context_length
+    )
+    embedding_prompt = config.embedding.model.prompt?
+    log(
+      :info, 'Embedding search request',
+      data: {
+        model:      config.embedding.model.to_h,
+        collection: collection,
+        query:      effective_query,
+        prompt:     embedding_prompt,
+      }
+    )
+    records = @documents.find_where(
+      effective_query,
       tags:,
-      prompt:         config.embedding.model.prompt?,
+      prompt:         embedding_prompt,
       text_size:,
       text_count:,
       min_similarity:
     )
+    log(
+      :info, 'Embedding search response',
+      data: {
+        collection:   collection,
+        query:        effective_query,
+        result_count: records.size,
+        top:          records.first&.similarity&.round(4),
+      }
+    )
+    records
   end
 
   # Reranks a set of records using the LLM with the `rerank` prompt.
@@ -43,11 +66,11 @@ module OllamaChat::CollectionSearch
   # @return [Array<Documentrix::Utils::TagResult>] filtered records
   def rerank_records(query, records, prompt_name: nil)
     candidates = records.each_with_index.map { |r, i|
-      "[#{i}] #{truncate(r.text.strip, length: 300)}"
+      "[#{i}] #{r.tags_set.to_s(link: false)} #{truncate(r.text.squeeze, length: 300)}"
     }.join("\n")
 
-    prompt_name ||= 'rerank'
-    rerank_prompt = prompt(prompt_name) or
+    prompt_name ||= 'default'
+    rerank_prompt = prompt(prompt_name, context: 'rerank') or
       raise 'missing prompt %s' % prompt_name.inspect
     rerank_prompt = rerank_prompt.to_s
       .named_placeholders_interpolate({ query:, candidates: })
@@ -63,4 +86,77 @@ module OllamaChat::CollectionSearch
     end
     records
   end
+
+  # Injects relevant snippets from the session's trigger collection
+  # into the conversation as a tool message.
+  #
+  # Reads the first entry of the session's `trigger` hash, performs a
+  # vector search in the configured collection, reranks the candidates
+  # via the LLM, and appends a `trigger_inject` tool message containing
+  # the surviving snippets (text, similarity, tags). The message is
+  # grouped with the current user message via `group_uuid`.
+  #
+  # @param content [String] the parsed user message text used as the
+  #   search query
+  # @param group_uuid [String, nil] the group UUID for message grouping
+  #   (shared with the user message and runtime-info message)
+  #
+  # @return [self, nil] self if snippets were injected, nil if no
+  #   trigger is configured, the trigger or embedding is disabled, the
+  #   collection or prompt is missing, or no snippets survived reranking
+  def trigger_inject(content, group_uuid:)
+    embedding.on? or return
+    trigger = session.trigger&.first or return
+    collection, config = trigger
+    unless config['enabled']
+      log(:info, 'Trigger for collection %s disabled.' % collection)
+      return
+    end
+    unless col = database_collection?(collection)
+      log(:error, 'Unknown collection named %s' % collection)
+      return
+    end
+    prompt_name = config['prompt_name']
+    unless rerank_prompt = prompt(prompt_name, context: 'rerank').full?(:to_s)
+      log(
+        :error, 'Unknown rerank prompt named %s' % prompt_name,
+        data: { config: }
+      )
+      return
+    end
+    records = []
+    switch_collection(collection) do
+      records = find_document_records(content, text_count: config['text_count'])
+      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: })
+      records.empty? and return
+    end
+    snippets = records.map { |record|
+      {
+        text:       record.text,
+        similarity: record.similarity.to_f,
+        tags:       record.tags_set.to_s(link: false),
+      }
+    }
+    message_content = {
+      prompt: prompt('snippets_trigger').to_s,
+      collection: {
+        name:        collection,
+        description: col.description&.to_s,
+      },
+      snippets:
+    }.to_json
+    tool_name       = 'trigger_inject'
+    messages << OllamaChat::Message.new(
+      role:        'user',
+      tool_name:   ,
+      sender_name: tool_name,
+      content:     message_content,
+      group_uuid:
+    )
+    self
+  end
 end

data/lib/ollama_chat/commands.rb

@@ -113,15 +113,16 @@ module OllamaChat::Commands
 
   command(
     name: :session,
-    regexp: %r(^/session(?:\s+(change|previous|list|new|duplicate|rename|delete|model options change|model options))?((?:\s+-(?:p\s*\w+))*)(?:\s+([^-].*))?$),
-    complete: [ 'session', %w[ change previous list new duplicate rename delete model\ options\ change model\ options ] ],
+    regexp: %r(^/session(?:\s+(change|previous|list|new|duplicate|rename|delete|model options change|model options|trigger edit))?((?:\s+-(?:p\s*\w+))*)(?:\s+([^-].*))?$),
+    complete: [ 'session', %w[ change previous list new duplicate rename delete model\ options\ change model\ options trigger\ edit ] ],
     optional: true,
     options: "[-p profile]\n[name]",
     help: <<~EOT
       💬 Manage sessions:
          - list/new/delete/rename/duplicate
          - change [name]/previous
-         - model options/change
+          - model options/change
+          - trigger edit
     EOT
   ) do |subcommand, opts, name|
     case subcommand
@@ -152,6 +153,8 @@ module OllamaChat::Commands
       else
         feedback("No previous session defined.", type: :info)
       end
+    when 'trigger edit'
+      edit_session_trigger
     end
     :next
   end
@@ -424,15 +427,7 @@ module OllamaChat::Commands
         feedback("Denied.", type: :denied)
       end
     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])
@@ -645,12 +640,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
@@ -662,7 +657,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'
@@ -826,12 +825,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
@@ -295,11 +295,15 @@ module OllamaChat::Compaction
       Context:      #{result.context_before} → #{result.context_after}
       Stored total: #{result.stored_total}
     EOT
+    duration        = Tins::Duration.new(duration)
+    duration_string = duration.format(
+      duration.minutes? ? '%M minutes and %u seconds' : '%u seconds'
+    )
     speak(
-      'Compressed conversation context from %.f to %.f in %.1f seconds.' % [
+      'Compressed conversation context from %.f to %.f in %s.' % [
         100 * result.context_filled_before,
         100 * result.context_filled_after,
-        duration,
+        duration_string,
       ]
     )
   end

data/lib/ollama_chat/database/migrations/011_add_trigger_to_sessions.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table :sessions do
+      add_column :trigger, :text
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
   plugin :touch
   plugin :serialization, :json, :tools_default_enabled
   plugin :serialization, :json, :model_options
+  plugin :serialization, :json, :trigger
   plugin :validation_helpers
 
   # Validates the session instance.
@@ -133,6 +134,15 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
   # @!attribute [v] model_options
   #   @return [String, nil] A JSON-serialized string containing model-specific options.
   #
+  # @!attribute [v] trigger
+  #   @return [Hash, nil] Maps collection names to search/rerank
+  #     overrides, e.g.
+  #     `{ 'memory-miyu' => { 'prompt_name' => 'memory_rerank',
+  #       'text_count' => 5 } }`.
+  #     Recognized keys: `prompt_name`, `text_count`, `text_size`,
+  #     `min_similarity`.
+  #     `nil` when the trigger mechanism is disabled for this session.
+  #
   # @!attribute [v] messages
   #   @return [String] The full conversation history, stored in JSONL format.
   #
@@ -184,6 +194,7 @@ class OllamaChat::Database::Models::Session < Sequel::Model(OllamaChat::DB)
       context_format:        chat.config.context.format,
       working_directory:     Dir.pwd,
       messages:              '',
+      trigger:               nil,
     }
     new(attributes)
   end

data/lib/ollama_chat/database/session_locking.rb

@@ -25,10 +25,11 @@ module OllamaChat::Database::SessionLocking
 
   # Attempts to acquire a lock on the session.
   #
+  # @param chat [OllamaChat] the chat instance that receives feedback
   # @return [Boolean] true if the lock was successfully acquired, false if already locked.
-  def lock?
+  def lock?(chat:)
     if running_pid = locked?
-      feedback("session #{id} locked by running process #{running_pid}", type: :warn)
+      chat.feedback("session #{id} locked by running process #{running_pid}", type: :warn)
       false
     else
       lock

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