ollama_chat 0.0.128 → 0.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c69119a9431fed33aea9fe4f2f23594eea70c570fb5f08b39b88daee8bd31a
-  data.tar.gz: efd37e4ba7c7971369bf4bd3f7ea95dd1a031f21f54f8a1b438a516db5b577c1
+  metadata.gz: 01d91ba996f30f84990c3d3eb60d0e65cc46b3eb0c593bd55eab6cc580e935e1
+  data.tar.gz: 28563308f748187b5cf15dcad886a775dcb6d2abd3c4466ab66854a10dec63fd
 SHA512:
-  metadata.gz: cadf4af1255ea0232708e463b4c48f8b7497a556e4e14766f83c2291da8de7c9f77591da2a1d43678502d41bf414ed2e806ca46ef744d09ca85a33212474891a
-  data.tar.gz: 3e286668006435fe9fc00fdafbaa21d1d422ac99b00631838a69b2e334de30a50e3421a5172763827021370d3eb20eacdf16f7ca5f01a60a4baa4634d678b448
+  metadata.gz: edb330105098a15cb10bb0edaaca0131c1f339568c5639d2bc75b02adfaf1a4e0b94176e663e45784e9fb0d978732c854a680b937d135205bcb88c943c02c8b0
+  data.tar.gz: 2dff67556aab12d5ad4a9a72239ffa34982804cfa311970a42bf35af33ad1e848baf94f82d74e9e65f21724019963b016c05823fa7e1ec40e01f7b511c1824fd

data/CHANGES.md

@@ -1,5 +1,84 @@
 # Changes
 
+## 2026-10-08 v0.0.130
+
+*   Replace `ask?` with `confirm?` in `rag_handling.rb` for the `[v]iew` /
+    `[c]lear` prompts in `#clear_collection_tags` and
+    `#clear_collection_sources` to bypass `Reline` and keep command history
+    clean.
+*   Add `use_pager(force: true)` in the `#clear_collection_sources` view branch
+    to fix display.
+*   Rewrite `confirm?` YARD documentation in `dialog.rb` to clarify the
+    two-branch return contract (`yes: nil` → raw char, `yes:` matcher → matched
+    char or `nil`) and history-pollution rationale.
+*   Swap 7 `ask?` → `confirm?` stubs in `rag_handling_spec.rb`.
+*   Add `line_numbers: true` to the `read_file` tool block in
+    `default_config.yml`.
+*   Update `read_file.rb` to fall back to `tool_config.line_numbers?` when the
+    model omits the argument and interpolate the live default into the tool
+    description.
+*   Fix typo in description: `linenumbers` → `line numbers`.
+*   Update specs to extract `let :tool`, adjust `nil`-arg expectations for the
+    `1: ` prefix, checksum, and `line_count`, and add a new spec asserting raw
+    content when `tool_config.line_numbers` is stubbed to `false`.
+
+## 2026-10-08 v0.0.129
+
+### Features
+
+*   **`get_url`**: Added support for the `file` scheme and updated the tool
+    description to display live allowed schemes.
+*   **`get_url`**: Implemented extraction of character card metadata from PNG
+    images when `sub_type` is `'png'`.
+*   **`patch_file`**: Enabled deletion of line ranges by passing `text: null`.
+    Omitting the key now raises an error, while an explicit `nil` value deletes
+    the range.
+*   **`update_collection`**: Prunes stale sources from the vector store when
+    collection patterns are shrunk, ensuring pattern edits propagate cleanly.
+*   **`/input`**: Clarified help text to distinguish between smart import
+    (content-type detection, HTML→MD, audio→ASR) and raw file reading.
+*   **`/conversation clean`**: Expanded help text to list cleanable categories
+    (`tools`, `images`, `thinking`, `messages`, `history`, `links`).
+
+### Fixes
+
+*   **`execute_grep`**: Replaced `it` with `_1` in the grep command template to
+    fix a Ruby **3.3** deprecation warning regarding the implicit block
+    parameter in **3.4**.
+*   **`less`/`more` fallback**: Split the combined fallback logic so that
+    `less` receives the `-r` flag for raw control characters, while `more`
+    remains bare, fixing compatibility with GNU `more` on Debian trixie.
+*   **`get_url`**: Fixed `URI.parse` errors for URLs containing spaces by
+    encoding them as `%20`.
+*   **Web searching prompts**: Corrected swapped prompt references to ensure
+    `prompt(:web_summarize)` is used for the 'summarizing' policy and
+    `prompt(:web_import)` for the import mode.
+*   **`source_fetching`**: Moved the `prompt(:embed)` call earlier to ensure it
+    is available for both concurrent and non-concurrent execution paths.
+
+### Refactoring
+
+*   **Tools**: Renamed `directory_structure` to `list_directory` (class
+    `DirectoryStructure` → `ListDirectory`).
+*   **Tools**: Renamed `gem_path_lookup` to `lookup_gem_path` (class
+    `GemPathLookup` → `LookupGemPath`) for verb-first naming consistency.
+*   **Tools**: Removed the `file_context` tool, as bulk file context is now
+    handled by `/input context` (ContextSpook).
+*   **`get_url`**: Reformatted description text for improved readability.
+
+### Dependencies
+
+*   Bumped the minimum version of the `tins` dependency to **1.60.1**.
+
+### Testing
+
+*   Stubbed `Tins::Terminal.columns` and `Tins::Terminal.lines` in
+    `spec/spec_helper.rb`.
+*   Added specs for PNG character card extraction and updated image spec
+    doubles to include `sub_type: 'jpeg'`.
+*   Split `patch_file` specs to distinguish between omitted keys (raises) and
+    explicit `nil` (deletes).
+
 ## 2026-10-07 v0.0.128
 
 ### Features

data/README.md

@@ -524,18 +524,18 @@ context, manipulate files, and retrieve external information.
 
 | Category | Tools | Description |
 | :--- | :--- | :--- |
-| **Filesystem** | `read_file`, `write_file`, `patch_file`, `delete_file`, `move_file`, `directory_structure`, `execute_grep`, `execute_shell` | Read, write, and search files within allowed directories; run shell commands as a last resort. |
-| **Ruby/Dev** | `resolve_tag`, `execute_ri`, `gem_path_lookup`, `run_tests`, `eval_ruby` | Introspect Ruby code, check documentation, and run test suites. |
+| **Filesystem** | `read_file`, `write_file`, `patch_file`, `delete_file`, `move_file`, `list_directory`, `execute_grep`, `execute_shell` | Read, write, and search files within allowed directories; run shell commands as a last resort. |
+| **Ruby/Dev** | `resolve_tag`, `execute_ri`, `lookup_gem_path`, `run_tests`, `eval_ruby` | Introspect Ruby code, check documentation, and run test suites. |
 | **Web/External** | `search_web`, `get_url`, `browse`, `get_rfc`, `get_cve`, `get_endoflife`, `get_ghr`, `get_jira_issue`, `execute_jira_twg` | Access the internet, fetch specific URLs, and look up technical standards; run Jira CLI queries via `twg`. |
 | **System/Util** | `get_time`, `get_location`, `get_current_weather`, `generate_password`, `compute_bmi`, `roll_dice` | General utility functions for time, location, and simple calculations. |
 | **Editor/Clip** | `copy_to_clipboard`, `paste_from_clipboard`, `paste_into_editor`, `open_file_in_editor` | Bridge the gap between the chat and the system clipboard or editor. |
-| **Knowledge** | `search_knowledge`, `file_context`, `lookup_group` | Semantic search for specific snippets, broad retrieval of structured project context, or retrieving prior message groups by UUID. |
+| **Knowledge** | `search_knowledge`, `lookup_group` | Semantic search for specific snippets, or retrieving prior message groups by UUID. |
 | **Multimodal** | `generate_image` | Generate images via a local ComfyUI server. |
 
-***Note on Knowledge Tools**: Use `search_knowledge` for precise,
-low-token semantic discovery and `file_context` for a comprehensive view of
-modules or patterns. Be cautious with broad patterns in `file_context`, as
-importing too many files can exceed the LLM's context window.*
+***Note on Knowledge Tools**: Use `search_knowledge` for low-token
+semantic discovery. For comprehensive project context, use the
+`/input context` command instead of loading files into the tool
+call context window.*
 
 ## External Dependencies
 

data/Rakefile

@@ -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.60'
+  dependency             'tins',                  '~> 1.60', '>= 1.60.1'
   dependency             'search_ui',             '>= 0.2'
   dependency             'amatch',                '~> 0.4'
   dependency             'pdf-reader',            '~> 2.0'

data/lib/ollama_chat/commands.rb

@@ -380,6 +380,12 @@ module OllamaChat::Commands
       💾 Manage conversation content:
          - save/load: Export/import as .json or .jsonl
          - clean: Interactively clean conversation content
+           - tools: tool call content
+           - images: added images
+           - thinking: reasoning content
+           - messages: all messages ⇒ tools, images, thinking
+           - history: command history
+           - links: remembered URLs
          - compact: Summarize old messages, keep recent
          - compact summary: Show last compaction summary
          - summarize: Per-message narrative (-s sentence)
@@ -867,7 +873,10 @@ module OllamaChat::Commands
     EOT
     help: <<~EOT
       📥 Import content (read, summarize, embed, context)
-         Subcommands: path, context, embedding, summary
+           Subcommands: path, context, embedding, summary
+           (no subcommand) → smart import (HTML→MD, audio→ASR,
+             image→context, PNG char cards)
+           path → raw file read (no parsing)
            Options: -p (pattern), -w [words], -a (all),
                     -c [collection], -t [tags], -e (edit),
                     -m (monochrome), -i (summary instruction),

data/lib/ollama_chat/dialog.rb

@@ -29,21 +29,37 @@ module OllamaChat::Dialog
     prefill and Reline.pre_input_hook = old_pre_input_hook
   end
 
-  # The confirm? method displays a prompt and reads a single character input
-  # from the user in raw mode, then returns that character. This is best used
-  # for confirmation prompts.
+  # The confirm? method displays a prompt and reads a **single keypress**
+  # from the user in raw mode (no Enter required), returning that character.
+  # Unlike {#ask?}, it does not go through Reline, so it never pollutes the
+  # command history — making it the right tool for confirmation gates *and*
+  # terse single-key selections such as `[v]iew` / `[c]lear` menus.
+  #
+  # The returned value depends on whether a positive-response matcher (`yes`)
+  # is supplied:
+  #
+  # - `yes: nil` (default) — the raw keypress is returned verbatim so the
+  #   caller can dispatch on it (e.g. `case key; when /\Av/i; ...`); on
+  #   timeout the `default` value is returned, and on interrupt (Ctrl-C)
+  #   `nil` is returned.
+  # - `yes: <Regexp/Object>` — the keypress is returned only when it
+  #   satisfies `yes === keypress` (e.g. `yes: /\Ay/i`); any other keypress,
+  #   or an interrupt, yields `nil`.
   #
   # @param prompt   [String]  the prompt to display to the user
   # @param timeout  [Integer, nil] optional timeout in seconds; if nil, the
-  #   method blocks until input, if 0 the method immediately returns the default
-  #   value.
+  #   method blocks until input, if 0 it immediately returns the `default`
+  #   value without waiting.
   # @param default  [Object, nil]  value returned when the timeout expires
   #   (defaults to `nil`)
-  # @param yes      [Object, nil]  value that is considered a positive response
+  # @param yes      [Object, nil]  matcher (`#===`) that defines a positive
+  #   response; when `nil` the raw keypress is returned for the caller to
+  #   interpret (default: `nil`)
   # @param output   [IO]  the IO object to write the prompt and the answer to
   #
-  # @return [Object] the character entered by the user, the `default` value
-  #   if a timeout occurs, or `nil` if the read is interrupted (e.g. Ctrl-C)
+  # @return [Object, nil] see the dispatch rules above: the keypress (or
+  #   `default` on timeout / `nil` on interrupt) when `yes:` is nil, otherwise
+  #   the keypress only if it matches `yes`, else `nil`.
   def confirm?(prompt:, timeout: nil, default: nil, yes: nil, output: STDOUT)
     return default if timeout&.zero?
     if prompt.include?('%s')

data/lib/ollama_chat/oc.rb

@@ -41,10 +41,10 @@ module OC
     description 'Pager command to use in case terminal lines are exceeded by output'
 
     default do
-      if fallback_pager = `which 2>/dev/null less`.full?(:chomp) ||
-          `which 2>/dev/null more`.full?(:chomp)
-      then
+      if fallback_pager = `which 2>/dev/null less`.full?(:chomp)
         fallback_pager << ' -r'
+      elsif fallback_pager = `which 2>/dev/null more`.full?(:chomp)
+        fallback_pager
       end
     end
   end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -584,13 +584,7 @@ tools:
     get_location:
       result_display_timeout: 3
       default: true
-    file_context:
-      default: false
-      require_confirmation: false
-      result_display_timeout: 3
-      allowed:
-        - './spec'
-    directory_structure:
+    list_directory:
       default: true
       require_confirmation: false
       result_display_timeout: 3
@@ -601,7 +595,7 @@ tools:
       default: true
       result_display_timeout: 3
       cmd: |
-        grep #{'-i' if ignore_case} -m #{max_results} -r #{before.full? { "-B %u " % it }}#{after.full? { "-A %u " % it }}#{context.full? { "-C %u " % it }}#{pattern} #{path}
+        grep #{'-i' if ignore_case} -m #{max_results} -r #{before.full? { "-B %u " % _1 }}#{after.full? { "-A %u " % _1 }}#{context.full? { "-C %u " % _1 }}#{pattern} #{path}
     execute_shell:
       default: false
       require_confirmation: false # Preflight confirm is skipped, but in-tool it's mandatory.
@@ -629,6 +623,7 @@ tools:
       default: true
       require_confirmation: false
       result_display_timeout: 3
+      line_numbers: true
       allowed:
         - './tmp'
         - './lib'
@@ -645,7 +640,8 @@ tools:
       schemes:
         - http
         - https
-    gem_path_lookup:
+        - file
+    lookup_gem_path:
       result_display_timeout: 3
       default: true
     lookup_group:

data/lib/ollama_chat/rag_handling.rb

@@ -248,7 +248,7 @@ module OllamaChat::RAGHandling
             label   = source ? "#{source} #{snippet}" : snippet
             feedback(label, type: :info)
             view_tag_records(tag, [record])
-            ask?(prompt: "  [c]lear / other to go back: ") =~ /\Ac/i or next
+            confirm?(prompt: "  [c]lear / other to go back: ") =~ /\Ac/i or next
             clear_tag_records(tag, source)
           else
             group_lines = []
@@ -270,7 +270,7 @@ module OllamaChat::RAGHandling
             )
             next if chosen.nil? || chosen == '[back]'
             src, recs = group_map[chosen]
-            action = ask?(prompt: "  [v]iew / [c]lear / other to go back: ")
+            action = confirm?(prompt: "  [v]iew / [c]lear / other to go back: ")
             case action
             when /\Av/i
               view_tag_records(tag, recs)
@@ -350,11 +350,11 @@ module OllamaChat::RAGHandling
           break
         else
           source = display_map[chosen]
-          action = ask?(prompt: "  [v]iew / [c]lear / other to go back: ")
+          action = confirm?(prompt: "  [v]iew / [c]lear / other to go back: ")
           case action
           when /\Av/i
             records = @documents.records(sources: [ source ])
-            use_pager do |output|
+            use_pager(force: true) do |output|
               output.puts "#{bold{source}} (#{records.size} records)"
               output.puts
               records.each do |record|
@@ -547,22 +547,30 @@ module OllamaChat::RAGHandling
         feedback("Collection #{collection.inspect} not found in database.", type: :warn)
         return ''
       end
+
+      matched_sources = nil
+      if patterns = col.patterns.full?
+        matched_sources = all_file_set(patterns).map(&:to_s).to_set
+      end
+
       sources = {}
       seen = {}
       @documents.each_record do |record|
         source = @documents.normalize_source(record.source) or next
-        seen.key?(source) and next
-        seen[source] = true
-        unless @documents.source_modified?(source)
-          infobar.puts "Source #{source.to_s.inspect} is unmodified. => Skipping."
-          next
+        if matched_sources.nil? || matched_sources.member?(source)
+          seen.key?(source) and next
+          seen[source] = true
+          unless @documents.source_modified?(source)
+            infobar.puts "Source #{source.to_s.inspect} is unmodified. => Skipping."
+            next
+          end
+          sources[source] = record.tags_set
         end
-        sources[source] = record.tags_set
         @documents.source_remove(source)
       end
 
       if patterns = col.patterns.full?
-        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.key?(_1) }
+        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.key?(_1) }.to_set
         new_sources.each { seen[_1] = true }
         new_sources.each { sources[_1] = [] }
       end

data/lib/ollama_chat/source_fetching.rb

@@ -288,12 +288,12 @@ module OllamaChat::SourceFetching
   #   to the tags array to apply to that source
   # @return [Array<String>] results from each successful embed call
   def bulk_embed_sources(sources_tags)
-    return sources_tags.map { |s, tags| embed(s, tags:) }.compact if
+    prompt = prompt(:embed)
+    return sources_tags.map { |s, tags| embed(s, prompt:, tags:) }.compact if
       sources_tags.size <= 1 or config.embedding.concurrency <= 1
 
     results = []
     mutex   = Mutex.new
-    prompt = prompt(:embed)
     Tins::Limited.new(config.embedding.concurrency, name: 'embed').process do |l|
       sources_tags.each do |s, tags|
         l.execute do

data/lib/ollama_chat/tools/execute_shell.rb

@@ -38,7 +38,7 @@ class OllamaChat::Tools::ExecuteShell
           then a mandatory y/n/i confirm prompt gates execution.
           Last resort: use ONLY when no dedicated tool covers
           the task (e.g. `git commit`, `bundle install`, `make`).
-          Prefer `execute_grep`, `directory_structure`, `read_file`,
+          Prefer `execute_grep`, `list_directory`, `read_file`,
           `patch_file` over shell equivalents. Only invoke when
           the user explicitly requests it or you have proposed
           the command to the user beforehand. Runs in the current

data/lib/ollama_chat/tools/get_url.rb

@@ -22,9 +22,10 @@ class OllamaChat::Tools::GetURL
       function: Tool::Function.new(
         name:,
         description: <<~EOT,
-         Web fetcher – Downloads any web resource (HTML, Markdown, plain text, or images)
-         at url and makes its contents available to the model. Good for pulling
-         documentation snippets or viewing generated images.
+         Web fetcher – Downloads any web resource (HTML, Markdown, plain text,
+         or images) at url and makes its contents available to the model. Good
+         for pulling documentation snippets or viewing generated images.
+         Allowed schemes: #{Array(tool_config.schemes?).map(&:to_s).join(', ')}
         EOT
         parameters: Tool::Function::Parameters.new(
           type: 'object',
@@ -46,8 +47,10 @@ class OllamaChat::Tools::GetURL
                 typically transform the source content into a text-based
                 representation
                 (e.g., HTML to Markdown, PDF to text) before processing.
-                - 'ignoring': Returns the raw content without any transformation (best for raw text, logs, or code).
-                - 'importing': Processes content (e.g., HTML to Markdown) and adds it to the chat context.
+                - 'ignoring': Returns the raw content without any
+                  transformation (best for raw text, logs, or code).
+                - 'importing': Processes content (e.g., HTML to Markdown) and
+                  adds it to the chat context.
                 - 'embedding': Processes the content for vector storage.
                 - 'summarizing': Returns a condensed summary of the content.
               EOT
@@ -104,7 +107,7 @@ class OllamaChat::Tools::GetURL
 
     allowed_schemes = Array(tool_config.schemes?).map(&:to_s)
 
-    url = URI.parse(args.url.to_s)
+    url = URI.parse(args.url.to_s.gsub(' ', '%20'))
     unless allowed_schemes.include?(url.scheme)
       raise OllamaChat::ToolFunctionArgumentError,
         "scheme #{url.scheme.inspect} not allowed "\
@@ -120,6 +123,10 @@ class OllamaChat::Tools::GetURL
       case source_io&.content_type&.media_type
       when 'image'
         chat.add_image(chat.images, source_io, source)
+        if source_io&.content_type&.sub_type == 'png'
+          source_io.rewind
+          content = chat.parse_png(source_io).full?(:join, ?\n)
+        end
       when 'text', 'application', nil
         case document_policy
         when 'ignoring'

data/lib/ollama_chat/tools/{directory_structure.rb → list_directory.rb}

@@ -6,12 +6,12 @@
 #
 # The tool supports traversing directories and returns a structured
 # representation of the file system hierarchy.
-class OllamaChat::Tools::DirectoryStructure
+class OllamaChat::Tools::ListDirectory
   include OllamaChat::Tools::Concern
   include OllamaChat::Utils::AnalyzeDirectory
 
   # @return [String] the registered name for this tool
-  def self.register_name = 'directory_structure'
+  def self.register_name = 'list_directory'
 
   # Creates and returns a tool definition for retrieving directory structure.
   #

data/lib/ollama_chat/tools/{gem_path_lookup.rb → lookup_gem_path.rb}

@@ -3,11 +3,11 @@
 # This tool allows the chat client to find the installation paths of gems
 # on the system. It integrates with the Ollama tool calling system to
 # provide gem path information to the language model.
-class OllamaChat::Tools::GemPathLookup
+class OllamaChat::Tools::LookupGemPath
   include OllamaChat::Tools::Concern
 
   # @return [String] the registered name for this tool
-  def self.register_name = 'gem_path_lookup'
+  def self.register_name = 'lookup_gem_path'
 
   # Creates and returns a tool definition for gem path lookup.
   #

data/lib/ollama_chat/tools/patch_file.rb

@@ -71,7 +71,8 @@ class OllamaChat::Tools::PatchFile
               type: 'array',
               description: <<~EOT,
                 A list of edits. Each edit must contain start_line, end_line,
-                and text.
+                and text. Set `text` to null to delete the line range
+                without replacement.
               EOT
               items: Tool::Function::Parameters::Property.new(
                 type: 'object',
@@ -86,7 +87,8 @@ class OllamaChat::Tools::PatchFile
                     type: 'integer', description: '1-indexed end line'
                   ),
                   text: Tool::Function::Parameters::Property.new(
-                    type: 'string', description: 'The replacement text'
+                    type: 'string',
+                    description: 'The replacement text. Set to null to delete the range.'
                   ),
                 },
               )
@@ -234,7 +236,7 @@ class OllamaChat::Tools::PatchFile
       s_idx = edit[:start_line] - 1
       e_idx = edit[:end_line] - 1
 
-      lines[s_idx..e_idx] = [edit[:text]]
+      lines[s_idx..e_idx] = edit[:text].nil? ? [] : [edit[:text]]
     end
 
     lines * ?\n
@@ -251,8 +253,8 @@ class OllamaChat::Tools::PatchFile
       e[:start_line] or raise OllamaChat::ToolFunctionArgumentError,
         "Edit ##{i + 1} is missing a start_line"
       e[:end_line] ||= e[:start_line]
-      e[:text] or raise OllamaChat::ToolFunctionArgumentError,
-        "Edit ##{i + 1} is missing its substiution text"
+      e.key?(:text) or raise OllamaChat::ToolFunctionArgumentError,
+        "Edit ##{i + 1} is missing the text key; set it to null to delete"
       if e[:start_line] < 1 || e[:end_line] > 1 && e[:end_line] > file_size || e[:start_line] > e[:end_line]
         raise OllamaChat::ToolFunctionArgumentError,
           "Invalid range for edit ##{i + 1}: lines #{e[:start_line]}-#{e[:end_line]} (File size: #{file_size})"

data/lib/ollama_chat/tools/read_file.rb

@@ -28,7 +28,7 @@ class OllamaChat::Tools::ReadFile
           File reader – Returns raw text from path if it’s within allowed
           directories. No side effects; useful for inspecting config or source
           files. You can optionally specify a line range to read. You can also
-          enable prefixing with linenumbers; this is highly recommended (and
+          enable prefixing with line numbers; this is highly recommended (and
           practically mandatory) before calling `open_file_in_editor` to ensure
           the line range is precise.
         EOT
@@ -53,8 +53,8 @@ class OllamaChat::Tools::ReadFile
             line_numbers: Tool::Function::Parameters::Property.new(
               type: 'boolean',
               description: <<~EOT
-                Whether to prefix each line with its line number,
-                e.g. "666: The line content…
+                Whether to prefix each line with its line number, e.g.
+                "666: The line content…" (default: #{!!tool_config.line_numbers?})
               EOT
             )
           },
@@ -77,12 +77,12 @@ class OllamaChat::Tools::ReadFile
   # @return [String] an error message as a JSON string if the operation fails
   # @raise [JSON::ParserError] if the result cannot be serialized to JSON
   def execute(tool_call, **opts)
-
     args   = tool_call.function.arguments
 
     start_line   = args.start_line.full?
     end_line     = args.end_line.full?
     line_numbers = args.line_numbers
+    line_numbers.nil? and line_numbers = !!tool_config.line_numbers?
 
     path                = assert_valid_path(args.path, tool_config.allowed?, check: :file)
     full_content        = path.read

data/lib/ollama_chat/tools.rb

@@ -90,15 +90,14 @@ require 'ollama_chat/tools/browse'
 require 'ollama_chat/tools/compute_bmi'
 require 'ollama_chat/tools/copy_to_clipboard'
 require 'ollama_chat/tools/delete_file'
-require 'ollama_chat/tools/directory_structure'
 require 'ollama_chat/tools/eval_ruby'
 require 'ollama_chat/tools/execute_grep'
 require 'ollama_chat/tools/execute_ri'
 require 'ollama_chat/tools/execute_shell'
 require 'ollama_chat/tools/execute_jira_twg'
-require 'ollama_chat/tools/file_context'
 require 'ollama_chat/tools/forget'
-require 'ollama_chat/tools/gem_path_lookup'
+require 'ollama_chat/tools/list_directory'
+require 'ollama_chat/tools/lookup_gem_path'
 require 'ollama_chat/tools/generate_image'
 require 'ollama_chat/tools/generate_password'
 require 'ollama_chat/tools/get_current_weather'

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.128'
+  VERSION         = '0.0.130'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama_chat/web_searching.rb

@@ -78,7 +78,7 @@ module OllamaChat::WebSearching
       end
       prompt.named_placeholders_interpolate({query:})
     elsif document_policy.selected == 'summarizing'
-      prompt = prompt(:web_import).to_s
+      prompt = prompt(:web_summarize).to_s
       results = urls.each_with_object('') do |url, content|
         summarize(url).full? do |c|
           content << c.ask_and_send_or_self(:read)
@@ -86,7 +86,7 @@ module OllamaChat::WebSearching
       end
       prompt.named_placeholders_interpolate({query:, results:})
     else
-      prompt = prompt(:web_summarize).to_s
+      prompt = prompt(:web_import).to_s
       results = urls.each_with_object('') do |url, content|
         import(url).full? do |c|
           content << c.ask_and_send_or_self(:read)