ollama_chat 0.0.137 → 0.0.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00825774cef8e349ad7666a4e3046995bfa4803216d75fe688c8479a3bfce6c2'
-  data.tar.gz: 45f95f47c73c711686b479c49ac6fec3309fe3a68c385fb9d780e28f8f10dd13
+  metadata.gz: e1a0cfa8c0914331039a424abe408286dce18f50b3b593bc3cac04c551c9b078
+  data.tar.gz: ab96f2413e6ab996329d654d1f7dc60b75d99cf6cd2bb93f5c0b1f5bc09627a7
 SHA512:
-  metadata.gz: 157e6951f84674cae4cc74e3423f9569f6cb30efc92109d7b27538ed7424e4d938e03513b9d3d0044b233be9f74b06572218c4ab128b5881d4361424585bf285
-  data.tar.gz: 98eed217eca3fc4e396110ec20729e9e10bad64e5bf40539df1768ccd70c21ede9896855ba94a4b551ab3133c3e6020f45383de2ef59e7e9e75206c168f685d7
+  metadata.gz: 987632cebff57817b71ad6f56326c85edf921a4f54c1a42fff906e93603ec7c45113be2eb0b57b372987f9050d62213f54985359fdaf84f4bbc5bcd4bcdf8392
+  data.tar.gz: 9d9cee9148bc2c3542c9eb543015fa5b16393832f2741b56926f8d6b37a0d0633abea5252d32a5d3b931e350d4e44d874e857cdf84ae72d0c70ab79d8b747183

data/CHANGES.md

@@ -1,5 +1,115 @@
 # Changes
 
+## 2026-10-30 v0.0.139
+
+### Features
+
+- Added terminal table wrapping for `/help` and `/session list` output. New
+  private methods `wrap_table_rows` and `table_column_budgets` in
+  `OllamaChat::KramdownANSI` compute per-column width budgets and wrap cell
+  content to fit within a configurable percentage of the terminal width.
+- Updated `help_message` and `list_sessions` to collect rows into arrays and
+  route them through `wrap_table_rows`, removing manual truncation and heading
+  assignment.
+
+### Fixes
+
+- Fixed a `TypeError` in `Collection.sync` when `chat.documents.collections`
+  yielded no collections (e.g., fresh database) by using `.to_a` instead of
+  relying on `Tins::NullClass#to_ary`.
+- Improved error handling in `fetch_source` for `OllamaChat::HTTPError` by
+  adding a dedicated rescue clause that logs a warning without a backtrace and
+  stamps `response_status` and `response_reason` onto the
+  `ResponseMetadata.failed` IO.
+- Added a non-2xx HTTP status guard in the `get_url` tool to short-circuit
+  processing before document policy dispatch, returning the raw body and a
+  status message instead of feeding error pages to the summarizer.
+
+### Improvements
+
+  - Updated the compaction voice report to format context fill percentages as
+    rounded integers with the unit "percent" for grammatical completeness
+    (e.g., "from 38 percent to 19 percent").
+  - Moved `configure_kramdown_ansi_styles` to a private method in
+    `OllamaChat::KramdownANSI`.
+  - Expanded YARD documentation for `OllamaChat::KramdownANSI` to describe
+    styling, parsing, and table wrapping concerns.
+
+### Build & CI
+
+  - Bumped `kramdown-ansi` dependency from `~> 0.7` to `~> 0.9` in `Rakefile`
+    and `ollama_chat.gemspec`.
+
+### Testing
+
+  - Updated `compaction_spec.rb` to expect rounded integer percentages in the
+    spoken compaction report.
+  - Updated `kramdown_ansi_spec.rb` to use a real `OllamaChat::Chat` instance
+    instead of a double and added examples for `wrap_table_rows` and
+    `table_column_budgets`.
+  - Updated `get_url_spec.rb` to stub `response_status: nil` on `SourceIO`
+    doubles and added a spec verifying that non-200 statuses skip summarization
+    and import.
+
+## 2026-10-28 v0.0.138
+
+### Features
+
+- Added `OllamaChat::Utils::Redact` module with `redact_password` to mask
+  credentials in URLs for user-facing display.
+- `memory_restore` now deduplicates entries by checking existing tags before
+  adding records, reporting the number of skipped duplicates.
+- `OllamaChat::Utils::AnalyzeDirectory` now returns a `Hash` with `:height` and
+  `:entries` keys instead of a bare `Array`. Entry hashes no longer include
+  `:type` or `:name`; directories are identified by a trailing `/` in `:path`.
+
+### Fixes
+
+- `use_model` now raises `OllamaChat::UnknownModelError` if the previous model
+  is missing or blank after a cancelled pull, preventing stale metadata from
+  being returned.
+- Fixed `update_collection` to use `Set` for the `seen` variable, resolving a
+  latent `NoMethodError` when upstream yields a `Set`.
+- Corrected the error message in `pull_model_unless_present` to reference the
+  `model` parameter instead of the potentially stale `@model` instance
+  variable.
+
+### Improvements
+
+- Applied password redaction to all user-visible URL displays, including
+  `Chat#inspect`, `Dialog#connect_message`, `Information#info_rag`,
+  `Information#print_welcome`, `Tools::Browse#execute`,
+  `Tools::GenerateImage#execute`, and `Fetcher.get`.
+- Standardized `Set` insertion to use the `<<` idiom across `conversation.rb`,
+  `http_handling.rb`, `rag_handling.rb`, `generate_image.rb`, and
+  `web_searching.rb`.
+- Added `<<` alias to `LinksSet` to support the standard `Set` insertion idiom.
+- `AnalyzeDirectory` now omits the `:children` key from directory entries when
+  the array is empty, both during build and pruning.
+
+### Build & CI
+
+- Added `lib/ollama_chat/utils/redact.rb` to the gemspec file list.
+
+### Testing
+
+- Updated `analyze_directory_spec.rb`, `parsing_spec.rb`, and
+  `list_directory_spec.rb` to assert the new `AnalyzeDirectory` return
+  structure.
+- Added specs for `redact_password` covering URI/String inputs, passthrough for
+  URLs without passwords, and non-mutation of the original object.
+- Added specs for `memory_restore` deduplication logic, covering partial and
+  full skip scenarios.
+- Updated `web_searching_spec.rb` to expect `<<` instead of `add` for link
+  insertion.
+
+### Documentation
+
+- Updated `execute_grep` tool description to explicitly state that the regex
+  runs against file contents.
+- Updated YARD documentation for `AnalyzeDirectory` to reflect the new return
+  value structure.
+
 ## 2026-10-23 v0.0.137
 
 ### Fixes

data/Rakefile

@@ -47,7 +47,7 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'kramdown-ansi',         '~> 0.7'
+  dependency             'kramdown-ansi',         '~> 0.9'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.61'
   dependency             'search_ui',             '>= 0.2'

data/lib/ollama_chat/chat.rb

@@ -344,7 +344,7 @@ class OllamaChat::Chat
   #
   # @return [String] the inspected string
   def inspect
-    "#<#{self.class}: #{base_url.to_s}>"
+    "#<#{self.class}: #{redact_password(base_url)}>"
   end
 
   # Returns the tool call processor instance.

data/lib/ollama_chat/command_concern.rb

@@ -6,6 +6,8 @@ module OllamaChat::CommandConcern
   extend Tins::Concern
 
   class_methods do
+    include OllamaChat::KramdownANSI
+
     # @!attribute [rw] commands
     #   @return [Hash<Symbol, Command>] A hash mapping command names to
     #   `Command` instances.
@@ -76,8 +78,8 @@ module OllamaChat::CommandConcern
         all_separators: true,
         border:         :unicode_round,
       }
-      table.headings  = %w[ CMD SUBCMD OPTS HELP ]
       sorted_commands = self.commands.sort_by { [ _2.category, _2.name ] }.map(&:last)
+      rows            = []
       cat             = nil
       sorted_commands.each do |command|
         command.help or next
@@ -93,15 +95,16 @@ module OllamaChat::CommandConcern
         }
         if cat != command.category
           cat = command.category
-          table << [ { value: bold{cat}, colspan: 4 } ]
+          rows << [ { value: bold{cat}, colspan: 4 } ]
         end
-        table << [
-          "%s" % command.command_names.map { ?/ + _1 }.join(?\n),
+        rows << [
+          '%s' % command.command_names.map { ?/ + _1 }.join(?\n),
           '%s' % subcommands,
           command.options,
           command.help,
         ]
       end
+      wrap_table_rows(rows, 4, headings: %w[ CMD SUBCMD OPTS HELP ], percentage: 95).each { |row| table << row }
       table
     end
   end

data/lib/ollama_chat/compaction.rb

@@ -327,7 +327,7 @@ module OllamaChat::Compaction
       duration.minutes? ? '%M minutes and %u seconds' : '%u seconds'
     )
     speak(
-      'Compressed conversation context from %.f to %.f in %s.' % [
+      'Compressed conversation context from %.0f percent to %.0f percent in %s.' % [
         100 * result.context_filled_before,
         100 * result.context_filled_after,
         duration_string,

data/lib/ollama_chat/conversation.rb

@@ -86,7 +86,7 @@ module OllamaChat::Conversation
           selected.merge(remaining)
           break
         else
-          selected.add(choice)
+          selected << choice
         end
       end
     end

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

@@ -51,7 +51,7 @@ class OllamaChat::Database::Models::Collection < Sequel::Model(OllamaChat::DB)
   #
   # @param chat [OllamaChat::Chat] the chat instance providing the configuration
   def self.sync(chat)
-    all_collections = (%w[ default ] + chat.documents.collections).to_set
+    all_collections = (%w[ default ] + chat.documents.collections.to_a).to_set
     all_collections.each do |name|
       where(name: name.to_s).first and next
       create(

data/lib/ollama_chat/dialog.rb

@@ -142,7 +142,7 @@ module OllamaChat::Dialog
   #   distinguish the connection type, e.g. `"embedding "` for a dedicated
   #   embedding host (default: `""`)
   def connect_message(base_url:, prefix: '')
-    feedback green { "Connecting to #{prefix}ollama #{base_url.to_s.inspect}…" }, type: :info
+    feedback green { "Connecting to #{prefix}ollama #{redact_password(base_url).inspect}…" }, type: :info
   end
 
   # Displays a success-level feedback message confirming that a

data/lib/ollama_chat/http_handling.rb

@@ -61,7 +61,7 @@ module OllamaChat::HTTPHandling
   # @yield [IO] yields a temporary file handle for the caller to consume.
   # @return [Object] the result of the block or the fetcher.
   def get_url(url, headers: nil, cache: nil, remember: true, &block)
-    remember and links.add(url.to_s)
+    remember and links << url.to_s
     headers = config.request_headers?.to_h | headers
     OllamaChat::Utils::Fetcher.get(
       url,

data/lib/ollama_chat/information.rb

@@ -16,6 +16,7 @@
 #   chat.usage
 module OllamaChat::Information
   extend Tins::Concern
+  include OllamaChat::Utils::Redact
 
   included do
     include UserAgent
@@ -190,7 +191,7 @@ module OllamaChat::Information
   def info_rag(output: STDOUT)
     if embedding.on?
       if base_url = OC::OLLAMA::EMBEDDING_URL?
-        output.puts "🔌 Connected to embedding ollama server on: #{base_url.to_s.inspect}"
+        output.puts "🔌 Connected to embedding ollama server on: #{redact_password(base_url)}"
       end
       output.puts "🗄️ Current RAG model is #{bold{@embedding_model}}"
       if @embedding_model_options.present?
@@ -220,7 +221,7 @@ module OllamaChat::Information
   def print_welcome(output: STDOUT)
     feedback(<<~EOT, output:)
       💎 Running ollama_chat version: #{bold{OllamaChat::VERSION}}
-      🔌 Connected to ollama server version: #{bold{server_version}} on: #{bold{server_url}}
+      🔌 Connected to ollama server version: #{bold{server_version}} on: #{bold{redact_password(server_url)}}
     EOT
   end
 

data/lib/ollama_chat/kramdown_ansi.rb

@@ -1,30 +1,22 @@
-# A module that provides Kramdown::ANSI styling configuration and parsing
-# functionality for OllamaChat.
+# A module that provides Kramdown::ANSI styling, parsing, and
+# terminal table wrapping for OllamaChat.
 #
-# This module handles the setup and application of ANSI styles for markdown
-# rendering, allowing for customizable terminal output formatting. It manages
-# the configuration of ANSI styles either from environment variables or falls
-# back to default settings, and provides methods to parse content with the
-# configured styling.
+# This module handles three concerns:
+#
+# * **Styling configuration** – sets up ANSI styles either from the
+#   `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES` environment variable or from
+#   built-in defaults.
+# * **Markdown parsing** – converts raw markdown into ANSI-formatted
+#   terminal output using the configured styles, with a fallback for
+#   invalid encodings.
+# * **Table wrapping** – computes per-column width budgets and wraps
+#   cell content so that `Terminal::Table` output stays within a
+#   configurable percentage of the terminal width.
 #
 # @example Configuring custom ANSI styles via environment variable
 #   Set KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES to a JSON object containing style
 #   definitions for customizing markdown output formatting in the terminal.
 module OllamaChat::KramdownANSI
-  # The configure_kramdown_ansi_styles method sets up ANSI styling for
-  # Kramdown::ANSI output by checking for specific environment variables and
-  # falling back to default styles.
-  #
-  # @return [ Hash ] a hash of ANSI styles configured either from environment
-  #   variables or using default settings
-  def configure_kramdown_ansi_styles
-    if json = OC::KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES?
-      Kramdown::ANSI::Styles.from_json(json).ansi_styles
-    else
-      Kramdown::ANSI::Styles.new.ansi_styles
-    end
-  end
-
   # The kramdown_ansi_parse method processes content using Kramdown::ANSI with
   # custom ANSI styles.
   #
@@ -49,6 +41,22 @@ module OllamaChat::KramdownANSI
     retry
   end
 
+  private
+
+  # The configure_kramdown_ansi_styles method sets up ANSI styling for
+  # Kramdown::ANSI output by checking for specific environment variables and
+  # falling back to default styles.
+  #
+  # @return [ Hash ] a hash of ANSI styles configured either from environment
+  #   variables or using default settings
+  def configure_kramdown_ansi_styles
+    if json = OC::KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES?
+      Kramdown::ANSI::Styles.from_json(json).ansi_styles
+    else
+      Kramdown::ANSI::Styles.new.ansi_styles
+    end
+  end
+
   # The kramdown_markdown_remove method strips markdown formatting, emoji,
   # ANSI escape sequences, and box-drawing characters from content, yielding
   # plain text suitable for TTS playback.
@@ -74,4 +82,82 @@ module OllamaChat::KramdownANSI
            .gsub(/\s{2,}/, ' ')
            .strip
   end
+
+  # Wraps the cells of a terminal table to fit within a terminal-width
+  # budget.
+  #
+  # Terminal::Table sizes each column to its widest cell, so a single long
+  # cell forces the whole table wider than the terminal. This computes a
+  # per-column budget from the widest cell in each column across all rows,
+  # then wraps each cell to it. Cells expressed as Hashes (e.g. colspan
+  # rows) are passed through untouched.
+  #
+  # @param rows [Array<Array<String, Hash>>] the data rows to wrap
+  # @param cols [Integer] the number of columns in the table
+  # @param headings [Array<String>, nil] the heading row; when given it is
+  #   measured for the budget and returned first, right-padded to each
+  #   column's allocated width so Terminal::Table sizes columns to the
+  #   full budget even when no data cell reaches it
+  # @param percentage [Numeric] the percentage of terminal width to use for
+  #   the total budget (default: 90)
+  # @return [Array<Array<String, Hash>>] wrapped rows; the padded heading
+  #   row is returned first when `headings` was supplied
+  def wrap_table_rows(rows, cols, headings: nil, percentage: 90)
+    all    = rows + (headings ? [headings] : [])
+    budget = table_column_budgets(all, cols, percentage:)
+    wrap_row = ->(row) {
+      row.each_with_index.map { |cell, i|
+        cell.is_a?(Hash) and next cell
+        Kramdown::ANSI::Width.wrap(cell.to_s, length: budget[i], reflow: false)
+      }
+    }
+    result = rows.map(&wrap_row)
+    if headings
+      padded = headings.each_with_index.map { |h, i|
+        w = Kramdown::ANSI::Width.display_width(h)
+        w < budget[i] ? h + ' ' * (budget[i] - w) : h
+      }
+      result.unshift(padded)
+    end
+    result
+  end
+
+  # Computes a per-column display-width budget for a terminal table.
+  #
+  # @param rows [Array<Array<String, Hash>>] the rows to measure (Hash cells
+  #   are ignored)
+  # @param cols [Integer] the number of columns
+  # @param percentage [Numeric] the percentage of terminal width to use for
+  #   the total budget (default: 90)
+  # @return [Array<Integer>] the per-column width budget
+  def table_column_budgets(rows, cols, percentage: 90)
+    max_w = Array.new(cols, 0)
+    rows.each do |row|
+      row.each_with_index do |cell, i|
+        cell.is_a?(Hash) and next
+        w = cell.to_s.lines.map { |l| Kramdown::ANSI::Width.display_width(l) }.max || 0
+        max_w[i] = [max_w[i], w].max
+      end
+    end
+    total  = max_w.sum
+    budget = Kramdown::ANSI::Width.width(percentage:) - (3 * cols + 1)
+    return Array.new(cols, (budget.to_f / cols).to_i) if total.zero?
+    if total <= budget
+      extra = budget - total
+      max_w.map { |w| w + ((w.to_f / total) * extra).floor }
+    else
+      share  = (budget.to_f / cols).to_i
+      alloc  = max_w.map { |w| [w, share].min }
+      unused = budget - alloc.sum
+      return alloc if unused.zero?
+      capped = (0...cols).to_a.select { |i| alloc[i] < max_w[i] }
+      need   = capped.sum { |i| max_w[i] - alloc[i] }
+      return alloc if need.zero?
+      capped.each do |i|
+        extra = ((max_w[i] - alloc[i]).to_f / need * unused).floor
+        alloc[i] = [max_w[i], alloc[i] + extra].min
+      end
+      alloc
+    end
+  end
 end

data/lib/ollama_chat/links_set.rb

@@ -23,6 +23,7 @@ class OllamaChat::LinksSet
     @set.add(x)
     sync
   end
+  alias << add
 
   # Removes all links from the set and synchronizes it with the session.
   #

data/lib/ollama_chat/model_handling.rb

@@ -465,7 +465,7 @@ module OllamaChat::ModelHandling
       if model_metadata = model_present?(model, ollama:)
         return model_metadata
       end
-      raise OllamaChat::UnknownModelError, "unknown model named #{@model.inspect}"
+      raise OllamaChat::UnknownModelError, "unknown model named #{model.inspect}"
     end
   end
 
@@ -587,17 +587,25 @@ module OllamaChat::ModelHandling
     old_model   = @model
 
     if model.blank?
-      @model = choose_model('', @model)
+      new_model = choose_model('', old_model)
     else
-      @model = choose_model(model, config.model.name)
+      new_model = choose_model(model, config.model.name)
     end
 
-    if @model_metadata = model_present?(@model, ollama:)
-      session.update(current_model: @model)
-    else
-      session.update(current_model: nil)
+    unless model_metadata = model_present?(new_model, ollama:)
+      feedback("Model #{bold{new_model}} not found locally.", type: :warn)
+      unless confirm?(prompt: "Pull it from remote? (y/n) ", yes: /\Ay/i)
+        feedback("Cancelled.", type: :cancel)
+        old_model.full? && model_present?(old_model, ollama:) or
+              raise OllamaChat::UnknownModelError, "no usable model after cancel"
+        return @model_metadata
+      end
+      model_metadata = pull_model_unless_present(new_model, ollama:)
     end
 
+    @model, @model_metadata = new_model, model_metadata
+    session.update(current_model: @model)
+
     if old_model != @model
       reconfigure_model_options(profile:, keep_options:)
       if @model_metadata&.can?('thinking')

data/lib/ollama_chat/rag_handling.rb

@@ -122,7 +122,7 @@ module OllamaChat::RAGHandling
           selected.merge(remaining)
           break
         else
-          selected.add(choice)
+          selected << choice
         end
       end
     end
@@ -202,7 +202,7 @@ module OllamaChat::RAGHandling
           selected.merge(remaining)
           break
         else
-          selected.add(choice)
+          selected << choice
         end
       end
     end
@@ -213,14 +213,25 @@ module OllamaChat::RAGHandling
 
     feedback("Restoring #{selected.size} collection(s): #{selected.join(', ')}")
 
-    total = 0
+    total   = 0
+    skipped = 0
     collections.slice(*selected).sort.each do |col, group|
       create_memory_collection(col)
       switch_collection(col) do
+        existing_tags = Set.new
+        @documents.each_record do |r|
+          r.tags.each { |t| existing_tags << t.to_s(link: false) }
+        end
+
         group.each do |entry|
+          tags = Array(entry['tags'])
+          if tags.any? { |t| existing_tags.include?(t) }
+            skipped += 1
+            next
+          end
           @documents.add(
             [entry['text']],
-            tags: Array(entry['tags']),
+            tags:,
             batch_size: 1,
             source: entry['source']
           )
@@ -230,9 +241,10 @@ module OllamaChat::RAGHandling
     end
 
     log(:info, 'Memory restored',
-        data: { file: filename.to_s, collections: selected, records: total })
+        data: { file: filename.to_s, collections: selected, records: total, skipped: })
     feedback(
-      "Restored #{total} record(s) across #{selected.size} collection(s) from #{filename.to_s.inspect}.",
+      "Restored #{total} record(s) across #{selected.size} collection(s) from #{filename.to_s.inspect}." +
+        (skipped.zero? ? '' : " (#{skipped} duplicate(s) skipped)."),
       type: :success
     )
   end
@@ -374,7 +386,7 @@ module OllamaChat::RAGHandling
         source_tags = Hash.new { |h, k| h[k] = Set.new }
         @documents.records.each do |record|
           source = record.source.full? or next
-          sources.add(source)
+          sources << source
           source_tags[source].merge(record.tags)
         end
         display_map = {}
@@ -599,12 +611,12 @@ module OllamaChat::RAGHandling
       end
 
       sources = {}
-      seen = {}
+      seen    = Set.new
       @documents.each_record do |record|
         source = @documents.normalize_source(record.source) or next
         if matched_sources.nil? || matched_sources.member?(source)
-          seen.key?(source) and next
-          seen[source] = true
+          seen.member?(source) and next
+          seen << source
           unless @documents.source_modified?(source)
             infobar.puts "Source #{source.to_s.inspect} is unmodified. => Skipping."
             next
@@ -615,8 +627,8 @@ module OllamaChat::RAGHandling
       end
 
       if patterns = col.patterns.full?
-        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.key?(_1) }.to_set
-        new_sources.each { seen[_1] = true }
+        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.member?(_1) }.to_set
+        new_sources.each { seen << _1 }
         new_sources.each { sources[_1] = [] }
       end
 

data/lib/ollama_chat/session_management.rb

@@ -107,22 +107,23 @@ module OllamaChat::SessionManagement
         all_separators: true,
         border:         :unicode_round,
       }
-      table.headings = %w[ ID NAME SIZE #TOK COUNT UPDATED ].map { |header| bold { header } }
-      now = Time.now
+      headings = %w[ ID NAME SIZE #TOK COUNT UPDATED ].map { |h| bold { h } }
+      now      = Time.now
+      rows     = []
       models::Session.order(Sequel.desc(:updated_at)).each do |s|
-        name        = truncate(s.name, length: 32)
-        name        = session.id == s.id ? bold { name } : name
-        name        = if pid = s.locked?
-                        if pid == $$
-                          "#{name} 🔓"
-                        else
-                          "#{name} 🔐"
-                        end
-                      else
-                        name
-                      end
-        es = s.estimate_tokens
-        table << [
+        name   = s.name
+        name   = session.id == s.id ? bold { name } : name
+        name   = if pid = s.locked?
+                   if pid == $$
+                     "#{name} 🔓"
+                   else
+                     "#{name} 🔐"
+                   end
+                 else
+                   name
+                 end
+        es     = s.estimate_tokens
+        rows << [
           s.id.to_s,
           name,
           es.bytes_formatted,
@@ -131,6 +132,7 @@ module OllamaChat::SessionManagement
           s.age(now:),
         ]
       end
+      wrap_table_rows(rows, 6, headings:).each { |row| table << row }
       table.align_column 0, :right
       table.align_column 2, :left
       table.align_column 3, :right

data/lib/ollama_chat/source_fetching.rb

@@ -33,6 +33,7 @@ module OllamaChat::SourceFetching
   #
   # @yield [ tmp ]
   def fetch_source(source, check_exist: false, &block)
+    confirm_notification = false
     source = source.ask_and_send_or_self(:to_path).to_s
     case source
     when %r{\A!(.*)}
@@ -72,14 +73,28 @@ module OllamaChat::SourceFetching
     else
       raise "invalid source #{source.inspect}"
     end
+  rescue OllamaChat::HTTPError => e
+    msg = "Fetching source #{source.to_s.inspect}: #{e.class} #{e}"
+    feedback(msg, type: :warn)
+    log(:warn, msg, data: { source: source.to_s, status: e.status })
+    confirm_notification = true
+    msg = OllamaChat::Utils::Fetcher::ResponseMetadata.failed(msg)
+    msg.response_status = e.status
+    msg.response_reason = e.message
+    block.(msg)
+    msg
   rescue => e
     msg = "Fetching source #{source.to_s.inspect}: #{e.class} #{e}"
     feedback("#{msg}\n#{e.backtrace * ?\n}", type: :warn)
     log(:error, msg, data: { source: source.to_s, error: e.class })
-    confirm?(prompt: '⏎  Press any key to continue (%s). ', output: STDERR, timeout: 3)
+    confirm_notification = true
     msg = OllamaChat::Utils::Fetcher::ResponseMetadata.failed(msg)
     block.(msg)
     msg
+  ensure
+    if confirm_notification
+      confirm?(prompt: "\n⏎  Press any key to continue (%s). ", output: STDERR, timeout: 3)
+    end
   end
 
   # Adds an image to the images collection from the given source IO and source

data/lib/ollama_chat/tools/browse.rb

@@ -60,10 +60,10 @@ class OllamaChat::Tools::Browse
     result  = browse_url(url)
 
     message = if result.success?
-                 "Opened #{url.to_s.inspect} in browser."
-               else
-                 "Could not open #{url.to_s.inspect} in browser."
-               end
+                "Opened #{redact_password(url).inspect} in browser."
+              else
+                "Could not open #{redact_password(url).inspect} in browser."
+              end
 
     {
       success:    result.success?,

data/lib/ollama_chat/tools/concern.rb

@@ -7,6 +7,7 @@
 module OllamaChat::Tools::Concern
   extend Tins::Concern
   include OllamaChat::Utils::ValueFormatter
+  include OllamaChat::Utils::Redact
   include OllamaChat::Utils::Backup
   include OllamaChat::Feedback