ollama_chat 0.0.85 → 0.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9e61c3d789441bb11ee79fe2ec63f219cc8d938845a7dc6fe9c8f6d012d5bb
-  data.tar.gz: f453e609568a6df073fbaf865860fa1c919419b728c309ae0e19e97dc09d6b52
+  metadata.gz: ff96f5853a0c293512e72157a823fb8237bfba6b1e36b1cf17c486cd3594597d
+  data.tar.gz: bd23354a354c89d2526a64071a76801304e2e9ebe67e9a978f1e50d0a624c021
 SHA512:
-  metadata.gz: 24fadb41107daee4f625bb3d80743c8323624da545e6386b07ef25da5be3974afa2b0759a8db86d44eea04c9b156b92400e6a348d6bd9aae3dd71791939533bd
-  data.tar.gz: 7c43765e2da1f09781b6a8b0af70ea562cdec22fbdb4c92ab7f4eca033fdd3b9f79a55cbe3d7c3e91684c771a29cca95c76f26c44b7871cf9e142c3d0ca12179
+  metadata.gz: cea92ab75e86033f88e08bedc272e75d7151ee62eebba70328a17b7eaad6aba9d84dfcfe5e69e9757317cbb4e881e6ae9c5464b6070f4540f6bfe9d09cb19049
+  data.tar.gz: af5ec5db535c6baa88749a387ff3c6b08e593bb4a578f45851fa1d695c0a7fed387a9698e9e379c30561b357d529b5f77a2b26bbdfe1073d1c6bcfcc0f522945

data/CHANGES.md

@@ -1,5 +1,47 @@
 # Changes
 
+## 2026-04-02 v0.0.86
+
+- Updated `play_persona_prompt` in `lib/ollama_chat/personae_management.rb` to
+  include “(no need to read the file)” in the roleplay prompt template string.  
+- Added `optional: true` to the `/links` command in `lib/ollama_chat/chat.rb`.  
+- Made the `edit` subcommand of `/revise` optional by adding `optional: true`
+  to its command definition in `lib/ollama_chat/chat.rb`.  
+- Added a `backup` subcommand for persona management:  
+  - Updated the `:persona` command regex and completion options in
+    `lib/ollama_chat/chat.rb`.  
+  - Added a case handler to invoke the new `backup_persona` method.  
+  - Implemented `backup_persona` in `lib/ollama_chat/personae_management.rb`
+    with YARD documentation.  
+  - Removed the redundant assignment `persona = persona` in `edit_persona`.  
+- Fixed the rescue exception class name in the `use_model` block of
+  `lib/ollama_chat/chat.rb`, changing from `OllamaChatError::UnknownModelError`
+  to `OllamaChat::UnknownModelError`.  
+- Ensured float division for duration calculations in `FollowChat` by
+  converting operands to float in the `eval_stats` method of
+  `lib/ollama_chat/follow_chat.rb`.  
+- Used `Pathname.new(file).expand_path.directory?` for tilde expansion in
+  directory checks in `lib/ollama_chat/parsing.rb`.  
+- Refactored command registration formatting in `lib/ollama_chat/chat.rb`.  
+- Added YARD documentation to the `OllamaChat::CommandConcern::Command` class
+  in `lib/ollama_chat/command_concern.rb`.  
+- Removed the deprecated `-d` flag from the `/input` command in
+  `lib/ollama_chat/chat.rb`.  
+- Removed tag support from `parse_content`:  
+  - Updated `OllamaChat::Chat` to call `parse_content` without expecting a
+    `tags` array.  
+  - Simplified handling of `@parse_content`.  
+  - Removed tag recognition logic from `OllamaChat::Parsing`.  
+  - Changed `parse_content` to return a single `String`.  
+  - Deleted tag‑specific example from the spec.  
+- Updated the `file_context` tool description for accuracy.  
+- Added an interactive loop to enable/disable tools:  
+  - Wrapped `enable_tool` and `disable_tool` in a `loop do` in
+    `lib/ollama_chat/tool_calling.rb`.  
+  - Modified `select_tools` to place `[EXIT]` at the start.  
+  - Handled user choice with `OllamaChat::Utils::Chooser.choose(select_tools)`
+    and exited on `[EXIT]` or `nil`.
+
 ## 2026-03-29 v0.0.85
 
 - Added `list` and `rename` subcommands to the `/collection` command, allowing

data/Rakefile

@@ -42,7 +42,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.21'
-  dependency             'documentrix',           '>= 0.1.0'
+  dependency             'documentrix',           '>= 0.1.1'
   dependency             'unix_socks',            '~> 0.3'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/lib/ollama_chat/chat.rb

@@ -296,7 +296,7 @@ class OllamaChat::Chat
   ) do
     begin
       use_model
-    rescue OllamaChatError::UnknownModelError => e
+    rescue OllamaChat::UnknownModelError => e
       msg = "Caught #{e.class}: #{e}"
       log(:error, msg, warn: true)
     end
@@ -410,6 +410,7 @@ class OllamaChat::Chat
     name: :links,
     regexp: %r(^/links(?:\s+(clear))?$),
     complete: [ 'links', %w[ clear ] ],
+    optional: true,
     help: 'display (or clear) links used in the chat',
   ) do |subcommand|
     manage_links(subcommand)
@@ -420,6 +421,7 @@ class OllamaChat::Chat
     name: :revise,
     regexp: %r(^/revise(?:\s+(edit))?$),
     complete: [ 'revise', %w[ edit ] ],
+    optional: true,
     help: 'revise the last message (and/or edit the query)'
   ) do |subcommand|
     if content = messages.second_last&.content
@@ -526,8 +528,8 @@ class OllamaChat::Chat
 
   command(
     name: :persona,
-    regexp: %r(^/persona(?:\s+(add|delete|edit|file|info|list|load|play))?$),
-    complete: [ 'persona', %w[ add delete edit file info list load play ] ],
+    regexp: %r(^/persona(?:\s+(add|delete|edit|backup|file|info|list|load|play))?$),
+    complete: [ 'persona', %w[ add delete edit backup file info list load play ] ],
     optional: true,
     help: 'manage and load/play personae for roleplay',
   ) do |subcommand|
@@ -553,6 +555,9 @@ class OllamaChat::Chat
       else
         :next
       end
+    when 'backup'
+      backup_persona
+      :next
     when 'file'
       if pathname = choose_filename('**/*.md')
         pathname.read
@@ -608,7 +613,7 @@ class OllamaChat::Chat
 
   command(
     name: :input,
-    regexp: %r(^/input(?:\s+(path|summary|context|embedding)(?:\s*(?=\z))?)?((?:\s+-(?:[ad]|w\s*\d+))*)(?:\s+(pattern))?(?:\s+(.+))?$),
+    regexp: %r(^/input(?:\s+(path|summary|context|embedding)(?:\s*(?=\z))?)?((?:\s+-(?:[a]|w\s*\d+))*)(?:\s+(pattern))?(?:\s+(.+))?$),
     optional: true,
     complete: [ 'input', [ 'path', 'summary', 'context', 'embedding', '', ], [ 'pattern', '' ] ],
     options: '[-w|-a] [arg…]',
@@ -1004,11 +1009,7 @@ class OllamaChat::Chat
 
       content = content.encode(invalid: :replace)
 
-      content, tags = if @parse_content
-                        parse_content(content, @images)
-                      else
-                        [ content, Documentrix::Utils::Tags.new(valid_tag: /\A#*([\w\]\[]+)/) ]
-                      end
+      @parse_content and content = parse_content(content, @images)
 
       runtime_info.on? && content and
         content << ?\n << {

data/lib/ollama_chat/command_concern.rb

@@ -31,8 +31,11 @@ module OllamaChat::CommandConcern
     #   exists or if no block is given.
     def command(name:, regexp:, complete: nil, optional: false, options: nil, help: nil, &block)
       name = name.to_sym
-      commands.key?(name) and raise ArgumentError, "command #{name} already registered!"
-      commands[name] = Command.new(name:, regexp:, complete:, optional:, options:, help:, &block)
+      commands.key?(name) and
+        raise ArgumentError, "command #{name} already registered!"
+      commands[name] =Command.new(
+        name:, regexp:, complete:, optional:, options:, help:, &block
+      )
     end
 
     # Return an array of all available command completions.
@@ -83,6 +86,21 @@ module OllamaChat::CommandConcern
     delegate :help_message, to: self
   end
 
+  # Represents a registered command in the OllamaChat command DSL.
+  #
+  # A `Command` instance stores
+  #   * the command name(s) (`@complete.first`),
+  #   * the matching regular expression (`@regexp`),
+  #   * optional completion hints (`@complete[1..]`),
+  #   * help text (`@help`), and
+  #   * the block that is executed when the command matches.
+  #
+  # It also exposes helpers for optionality (`optional?`),
+  # command names (`command_names`), arguments (`arguments`),
+  # and completions (`completions`).
+  #
+  # The `execute_if_match?` method performs a regexp match and, if
+  # successful, yields the execution context to the stored block.
   class Command
     # Create a new Command instance.
     #

data/lib/ollama_chat/follow_chat.rb

@@ -348,8 +348,8 @@ class OllamaChat::FollowChat
   #   the evaluation process including durations, counts, and rates, styled
   #   with colors and formatting
   def eval_stats(response)
-    eval_duration        = response.eval_duration / 1e9
-    prompt_eval_duration = response.prompt_eval_duration / 1e9
+    eval_duration        = response.eval_duration.to_f / 1e9
+    prompt_eval_duration = response.prompt_eval_duration.to_f / 1e9
     stats_text = {
       eval_duration:        Tins::Duration.new(eval_duration),
       eval_count:           response.eval_count.to_i,

data/lib/ollama_chat/parsing.rb

@@ -194,10 +194,6 @@ module OllamaChat::Parsing
   CONTENT_REGEXP = %r{
     (https?://\S+)                         # Match HTTP/HTTPS URLs
     |                                      # OR
-    (?<![a-zA-Z\d])                        # Negative lookbehind: not part of a larger word
-    \#                                     # Literal # character (starts a tag)
-    ([\w\]\[]+)                            # Tag content: alphanumeric, brackets, underscores
-    |                                      # OR
     (file://(?:[^\s#]+))                   # Match file:// URLs
     |                                      # OR
     "((?:\.\.|[~.]?)/(?:\\"|\\|[^"\\]+)+)" # Quoted file path with escaped " quotes
@@ -206,31 +202,27 @@ module OllamaChat::Parsing
   }x
   private_constant :CONTENT_REGEXP
 
-  # Parses content and processes embedded resources based on document policy
+  # Parses a string for URLs, file refs, and image links, then returns
+  # the transformed content.  Detects `http(s)` URLs, `file://` paths,
+  # quoted file paths, and collects any image URLs into the supplied
+  # `images` array.
   #
-  # This method analyzes input content for URLs, tags, and file references,
-  # fetches referenced resources, and processes them according to the current
-  # document policy. It supports different processing modes for various content
-  # types.
+  # @param content [String] the raw text to parse
+  # @param images  [Array] mutable array that will be cleared
+  #                  then filled with discovered image URLs
   #
-  # @param content [String] The input content string to parse
-  # @param images [Array] An array to collect image references (will be cleared)
-  # @return [Array<String, Documentrix::Utils::Tags>] Returns an array containing
-  #   the processed content string and tags object if any tags were found
+  # @return [String] the content after all supported transformations
+  #   (URLs resolved, file refs expanded, image URLs collected)
   def parse_content(content, images)
     images.clear
-    tags = Documentrix::Utils::Tags.new valid_tag: /\A#*([\w\]\[]+)/
     contents = [ content ]
-    content.scan(CONTENT_REGEXP).each { |url, tag, file_url, quoted_file, file|
-      if file && File.directory?(file)
+    content.scan(CONTENT_REGEXP).each { |url, file_url, quoted_file, file|
+      if file && Pathname.new(file).expand_path.directory?
         contents << generate_structure(file).to_json
         next
       end
       check_exist = false
       case
-      when tag
-        tags.add(tag)
-        next
       when url
         links.add(url.to_s)
         source = url
@@ -271,7 +263,6 @@ module OllamaChat::Parsing
         end
       end
     }
-    new_content = contents.select { _1.present? rescue nil }.compact * "\n\n"
-    return new_content, (tags unless tags.empty?)
+    contents.select { _1.present? rescue nil }.compact * "\n\n"
   end
 end

data/lib/ollama_chat/personae_management.rb

@@ -198,7 +198,6 @@ module OllamaChat::PersonaeManagement
   # old content, and returns the result after editing.
   def edit_persona
     if persona = choose_persona
-      persona  = persona
       pathname = personae_directory + persona
       old_content = File.read(pathname)
       if edit_file(pathname)
@@ -211,6 +210,21 @@ module OllamaChat::PersonaeManagement
     end
   end
 
+  # Backs up the content of a selected persona file.
+  #
+  # Prompts the user to select a persona from the available list. If a persona
+  # is selected, its current content is read and saved to a designated backup
+  # location using `File.write`. This ensures a safe copy is preserved before
+  # any modifications are made to the original file.
+  def backup_persona
+    if persona = choose_persona
+      pathname = personae_directory + persona
+      old_content = File.read(pathname)
+      File.write(persona_backup_pathname(persona), old_content)
+      STDOUT.puts "Wrote backup of #{persona.to_s} to #{pathname.to_s.inspect}."
+    end
+  end
+
   # Displays detailed information about a selected persona.
   #
   # Shows the persona's profile using kramdown formatting with ansi parsing.
@@ -325,7 +339,7 @@ module OllamaChat::PersonaeManagement
   # @return [String] Formatted roleplay prompt
   def play_persona_prompt(persona:, persona_profile:)
     persona_name = persona.basename.sub_ext('')
-    "Roleplay as persona %{persona_name} loaded from %{persona}\n\n%{persona_profile}" % {
+    "Roleplay as persona %{persona_name} (no nead to read the file) loaded from %{persona}\n\n%{persona_profile}" % {
       persona_name:, persona:, persona_profile:
     }
   end

data/lib/ollama_chat/tool_calling.rb

@@ -119,16 +119,18 @@ module OllamaChat::ToolCalling
   # tools and handles the user's selection by adding the chosen tool to the
   # list of enabled tools and sorting the list.
   def enable_tool
-    select_tools = configured_tools - enabled_tools
-    select_tools += [ '[EXIT]' ]
-    case chosen = OllamaChat::Utils::Chooser.choose(select_tools)
-    when '[EXIT]', nil
-      STDOUT.puts "Exiting chooser."
-      return
-    when *select_tools
-      enabled_tools << chosen
-      enabled_tools.sort!
-      puts "Enabled tool %s" % bold { chosen }
+    loop do
+      select_tools = configured_tools - enabled_tools
+      select_tools = [ '[EXIT]' ] + select_tools
+      case chosen = OllamaChat::Utils::Chooser.choose(select_tools)
+      when '[EXIT]', nil
+        STDOUT.puts "Exiting chooser."
+        return
+      when *select_tools
+        enabled_tools << chosen
+        enabled_tools.sort!
+        puts "Enabled tool %s" % bold { chosen }
+      end
     end
   end
 
@@ -141,15 +143,17 @@ module OllamaChat::ToolCalling
   # the chosen tool from the list of enabled tools and sorting the list
   # afterwards.
   def disable_tool
-    select_tools = enabled_tools
-    select_tools += [ '[EXIT]' ]
-    case chosen = OllamaChat::Utils::Chooser.choose(select_tools)
-    when '[EXIT]', nil
-      STDOUT.puts "Exiting chooser."
-      return
-    when *select_tools
-      enabled_tools.delete chosen
-      puts "Disabled tool %s" % bold { chosen }
+    loop do
+      select_tools = enabled_tools
+      select_tools = [ '[EXIT]' ] + select_tools
+      case chosen = OllamaChat::Utils::Chooser.choose(select_tools)
+      when '[EXIT]', nil
+        STDOUT.puts "Exiting chooser."
+        return
+      when *select_tools
+        enabled_tools.delete chosen
+        puts "Disabled tool %s" % bold { chosen }
+      end
     end
   end
 

data/lib/ollama_chat/tools/file_context.rb

@@ -27,9 +27,10 @@ class OllamaChat::Tools::FileContext
       function: Tool::Function.new(
         name:,
         description: <<~EOT,
-          Semantic file snapshot – Gathers AST‑style info (e.g., classes,
-          methods) from all matching files (pattern) in directory. Useful for
-          LLMs to reason about code structure
+          Reads all files matching a glob pattern like `lib/**/*.rb` and
+          returns their contents plus metadata. Provides file size, line count,
+          and tags. Useful for building codebase context to send to language
+          models or documenting project structure.
         EOT
         parameters: Tool::Function::Parameters.new(
           type: 'object',

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.85 ruby lib
+# stub: ollama_chat 0.0.86 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.85".freeze
+  s.version = "0.0.86".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.21".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.1.0".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.1.1".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/ollama_chat/parsing_spec.rb

@@ -128,12 +128,6 @@ describe OllamaChat::Parsing do
   end
 
   describe '#parse_content' do
-    it 'can parse tags' do
-      content, tags = chat.parse_content("see #foobar …", [])
-      expect(content).to eq 'see #foobar …'
-      expect(tags).to include('foobar')
-    end
-
     it 'can parse https URLs' do
       stub_request(:get, "https://www.example.com/foo.html").
         with(headers: { 'Host'       => 'www.example.com' }).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.85
+  version: 0.0.86
 platform: ruby
 authors:
 - Florian Frank
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: unix_socks
   requirement: !ruby/object:Gem::Requirement