ollama_chat 0.0.54 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a01656cc0ad8d063570956971ee34ebf94929e90feb3c5f8207879d8367a12
-  data.tar.gz: 87ce3880db6bfcbdaf049618a8922536bdcbdd20b15366187612fb0e33594fa0
+  metadata.gz: 683c0bf5fdb8756030c0c5b69767d95f8ae852094a0048cb61b4cf7166f6a045
+  data.tar.gz: 8e7f9022cfd1e9c32f987b76196222d346100cd5ceaa6d59e6dc5c30257e5dbb
 SHA512:
-  metadata.gz: c53b7fa09b117940de484fda33145e8f68ef7340da1e392e335f7aca5952c11ecbcad30a32e78551df1ff7972b20d7519a58a64dd808b5e9fecb309445ab12f8
-  data.tar.gz: c83bb2ae1c82af0aa66a99262c94d0fc7060807d3333d6ffd261bd558d0d338502419ca6ddf3a8b9b31f5a7ef48dc2c15ad6bd42d227a86290506bab12f3f7de
+  metadata.gz: 854af0ea07ced05e3f2f36741dd98592a2f6968e3307662e10c14bcb9a10b2168a1dde962de32f44e73719d177547cbccd8eee76c0554878a0de7ce2e1811772
+  data.tar.gz: 86b71f7b0748be19d0f772213b1a21ea8c7f838296bcd48348076ef39372e0a0f07db20c59a1c1b56f8a7592d100993a7ffa6b6507b4febbbca2977f0375baff

data/CHANGES.md

@@ -1,5 +1,57 @@
 # Changes
 
+## 2026-01-17 v0.0.56
+
+- Updated `context_spook` dependency from version **1.4** to **1.5**
+- Expanded context file inclusion to support YAML files
+- Updated `context_spook` method to pass `format` parameter to
+  `ContextSpook::generate_context` calls
+    - Added `context` section to default configuration with `format: JSON` setting
+- Added `/reconnect` command to reset Ollama connection
+    - Introduced `connect_ollama` method to create new Ollama client instances with
+      current configuration
+    - Added `base_url` method to resolve connection URL from command-line or
+      environment config
+    - Updated `handle_input` to process `/reconnect` command and trigger
+      reconnection
+- Enhanced `OllamaChat::InputContent#input` method to select and read multiple
+  files matching a glob pattern
+    - Updated `OllamaChat::InputContent#choose_filename` to accept a `chosen`
+      parameter for tracking selections
+    - Modified test cases in `spec/ollama_chat/input_content_spec.rb` to verify
+      multiple file selection behavior
+    - Files are now concatenated with filename headers in the output
+    - Maintains backward compatibility with single file selection
+    - Uses `Set` for efficient duplicate prevention during selection
+- Removed specialized CSV parsing functionality from `OllamaChat::Parsing`
+  module
+- Handle nil from `STDIN.gets` to prevent `NoMethodError`
+
+## 2026-01-08 v0.0.55
+
+- Added `OllamaChat::Vim` class for inserting text into Vim buffers using the
+  clientserver protocol
+- Implemented `server_name` and `clientserver` attribute readers for the
+  `OllamaChat::Vim` class
+- Enhanced error message for missing vim server to include the specific server
+  name being used
+- Added error handling to the `insert` method with fallback to `STDERR` output
+  when vim command fails
+- Added comprehensive specs for `OllamaChat::Vim` module with **100%** coverage
+- Fixed typo in help text for `ollama_chat_send` command ("reqired" →
+  "required")
+- Added comprehensive tests for `ThinkControl` module with **100%** coverage
+- Updated `README.md` and `OllamaChat::Information` to document the new
+  `/revise_last` command
+- Improved test coverage for Vim integration
+- Ensured proper state management and no side effects during selection in
+  `ThinkControl` tests
+- All tests use `connect_to_ollama_server` for proper setup
+- Fixed edge cases including exit conditions and nil selections in
+  `ThinkControl` tests
+- Included tests for combined logic with `think_loud` switch in `ThinkControl`
+  tests
+
 ## 2026-01-08 v0.0.54
 
 ### New Features

data/README.md

@@ -151,6 +151,7 @@ subject - the young, blue-eyed cat.
 The following commands can be given inside the chat, if prefixed by a `/`:
 
 ```
+/reconnect                      reconnect to current ollama server
 /copy                           to copy last response to clipboard
 /paste                          to paste content
 /markdown                       toggle markdown output
@@ -183,6 +184,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /compose                        compose content using an EDITOR
 /input [pattern]                select and read content from a file (default: **/*)
 /context [pattern...]           collect context with glob patterns
+/revise_last                    edit the last response in an external editor
 /output filename                save last response to filename
 /pipe command                   write last response to command's stdin
 /vim                            insert the last message into a vim server

data/Rakefile

@@ -58,7 +58,7 @@ GemHadar do
   dependency             'bigdecimal',            '~> 3.1'
   dependency             'csv',                   '~> 3.0'
   dependency             'const_conf',            '~> 0.3'
-  dependency             'context_spook',         '~> 1.1'
+  dependency             'context_spook',         '~> 1.5'
   development_dependency 'all_images',            '~> 0.6'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'kramdown',              '~> 2.0'

data/bin/ollama_chat_send

@@ -25,7 +25,7 @@ def usage(rc = 0)
       -d DIR     the working directory to derive the socket file from
       -h         Show this help message
 
-    Send data to a running Ollame Chat client via standard input.
+    Send data to a running Ollama Chat client via standard input.
   EOT
   exit rc
 end

data/lib/ollama_chat/chat.rb

@@ -88,15 +88,7 @@ class OllamaChat::Chat
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
     self.config         = @ollama_chat_config.config
     setup_switches(config)
-    base_url         = @opts[?u] || OllamaChat::EnvConfig::OLLAMA::URL
-    @ollama          = Ollama::Client.new(
-      connect_timeout: config.timeouts.connect_timeout?,
-      read_timeout:    config.timeouts.read_timeout?,
-      write_timeout:   config.timeouts.write_timeout?,
-      base_url:        base_url,
-      debug:           ,
-      user_agent:
-    )
+    @ollama = connect_ollama
     if server_version.version < '0.9.0'.version
       raise ArgumentError, 'require ollama API version 0.9.0 or higher'
     end
@@ -213,6 +205,11 @@ class OllamaChat::Chat
   #   the content to be processed, or nil for no action needed
   def handle_input(content)
     case content
+    when %r(^/reconnect)
+      STDERR.print green { "Reconnecting to ollama #{base_url.to_s.inspect}…" }
+      @ollama = connect_ollama
+      STDERR.puts green { " Done." }
+      :next
     when %r(^/copy$)
       copy_to_clipboard
       :next
@@ -680,6 +677,21 @@ class OllamaChat::Chat
 
   private
 
+  def base_url
+    @opts[?u] || OllamaChat::EnvConfig::OLLAMA::URL
+  end
+
+  def connect_ollama
+    Ollama::Client.new(
+      connect_timeout: config.timeouts.connect_timeout?,
+      read_timeout:    config.timeouts.read_timeout?,
+      write_timeout:   config.timeouts.write_timeout?,
+      base_url:        base_url,
+      debug:           ,
+      user_agent:
+    )
+  end
+
   # The setup_documents method initializes the document processing pipeline by
   # configuring the embedding model and database connection.
   # It then loads specified documents into the system and returns the

data/lib/ollama_chat/dialog.rb

@@ -76,7 +76,7 @@ module OllamaChat::Dialog
   # @return [ String ] the user's response with trailing newline removed
   def ask?(prompt:)
     print prompt
-    STDIN.gets.chomp
+    STDIN.gets.to_s.chomp
   end
 
   # The choose_collection method presents a menu to select or create a document

data/lib/ollama_chat/information.rb

@@ -118,6 +118,7 @@ module OllamaChat::Information
   # interface.
   private def display_chat_help_message
     <<~EOT
+      /reconnect                      reconnect to current ollama server
       /copy                           to copy last response to clipboard
       /paste                          to paste content
       /markdown                       toggle markdown output
@@ -150,6 +151,7 @@ module OllamaChat::Information
       /compose                        compose content using an EDITOR
       /input [pattern]                select and read content from a file (default: **/*)
       /context [pattern...]           collect context with glob patterns
+      /revise_last                    edit the last response in an external editor
       /output filename                save last response to filename
       /pipe command                   write last response to command's stdin
       /vim                            insert the last message into a vim server

data/lib/ollama_chat/input_content.rb

@@ -8,35 +8,40 @@ require 'tempfile'
 # interactive file selection and context collection for enhancing chat
 # interactions with local or remote content.
 module OllamaChat::InputContent
-  # The input method reads and returns the content of a selected file.
+  # The input method selects and reads content from files matching a pattern.
   #
-  # This method searches for files matching the given pattern and presents them
-  # in an interactive chooser menu. If a file is selected, its content is read
-  # and returned. If the user chooses to exit or no file is selected, the
-  # method returns nil.
+  # This method prompts the user to select files matching the given glob
+  # pattern, reads their content, and returns a concatenated string with each
+  # file's content preceded by its filename.
   #
-  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  # @param pattern [String] the glob pattern to search for files (defaults to '**/*')
   #
-  # @return [ String, nil ] the content of the selected file or nil if no file
-  #   was chosen
+  # @return [String] a concatenated string of file contents with filenames as headers
   def input(pattern)
     pattern ||= '**/*'
-    if filename = choose_filename(pattern)
-      File.read(filename)
+    files = Set[]
+    while filename = choose_filename(pattern, chosen: files)
+      files << filename
     end
+    result = ''
+    files.each do |filename|
+      result << ("%s:\n\n%s\n\n" % [ filename, File.read(filename) ])
+    end
+    result.full?
   end
 
-  # The choose_filename method selects a file from a list of matching files.
-  #
-  # This method searches for files matching the given glob pattern, presents
-  # them in an interactive chooser menu, and returns the selected filename. If
-  # the user chooses to exit or no file is selected, the method returns nil.
+  # The choose_filename method selects a file from a list of matching files. It
+  # searches for files matching the given pattern, excludes already chosen
+  # files, and presents them in an interactive chooser menu.
   #
-  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  # @param pattern [ String ] the glob pattern to search for files
+  # @param chosen [ Set ] a set of already chosen filenames to exclude from
+  #   selection
   #
-  # @return [ String, nil ] the path to the selected file or nil if no file was chosen
-  def choose_filename(pattern)
-    files = Dir.glob(pattern).select { File.file?(_1) }
+  # @return [ String, nil ] the selected filename or nil if no file was chosen or user exited
+  def choose_filename(pattern, chosen: nil)
+    files = Dir.glob(pattern).reject { chosen&.member?(_1) }.
+      select { File.file?(_1) }
     files.unshift('[EXIT]')
     case chosen = OllamaChat::Utils::Chooser.choose(files)
     when '[EXIT]', nil
@@ -75,8 +80,9 @@ module OllamaChat::InputContent
   # @example Load default context
   #   context_spook(nil)
   def context_spook(patterns)
+    format = config.context.format
     if patterns
-      ContextSpook::generate_context(verbose: true) do |context|
+      ContextSpook::generate_context(verbose: true, format:) do |context|
         context do
           Dir.glob(patterns).each do |filename|
             File.file?(filename) or next
@@ -86,7 +92,7 @@ module OllamaChat::InputContent
       end.to_json
     else
       if context_filename = choose_filename('.contexts/*.rb')
-        ContextSpook.generate_context(context_filename, verbose: true).to_json
+        ContextSpook.generate_context(context_filename, verbose: true, format:).to_json
       end
     end
   end
@@ -102,7 +108,7 @@ module OllamaChat::InputContent
   # @return [ String, nil ] the composed content if successful, nil otherwise
   def compose
     unless editor = OllamaChat::EnvConfig::EDITOR?
-      STDERR.puts "Editor reqired for compose, set env var "\
+      STDERR.puts "Editor required for compose, set env var "\
         "#{OllamaChat::EnvConfig::EDITOR!.env_var.inspect}."
       return
     end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -43,6 +43,8 @@ stream: true
 document_policy: importing
 think: false
 think_loud: true
+context:
+  format: JSON
 embedding:
   enabled: true
   paused: false

data/lib/ollama_chat/parsing.rb

@@ -30,8 +30,6 @@ module OllamaChat::Parsing
       end
       source_io.rewind
       source_io.read
-    when 'text/csv'
-      parse_csv(source_io)
     when 'application/rss+xml'
       parse_rss(source_io)
     when 'application/atom+xml'

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat/vim.rb

@@ -27,6 +27,18 @@ class OllamaChat::Vim
     @clientserver = clientserver || 'socket'
   end
 
+  # The server_name attribute reader returns the name of the Vim server to
+  # connect to.
+  #
+  # @return [ String ] the name of the Vim server
+  attr_reader :server_name
+
+  # The clientserver attribute reader returns the clientserver protocol to be
+  # used.
+  #
+  # @return [ String ] the clientserver protocol identifier
+  attr_reader :clientserver
+
   # The default_server_name method generates a standardized server name
   # based on a given name or the current working directory.
   #
@@ -54,14 +66,24 @@ class OllamaChat::Vim
   # The text is automatically indented to match the current column position.
   #
   # @param text [String] The text to be inserted into the Vim buffer
+  # @return [OllamaChat::Vim, nil] Returns self if successful or nil.
   def insert(text)
     spaces = (col - 1).clamp(0..)
     text   = text.gsub(/^/, ' ' * spaces)
     Tempfile.open do |tmp|
       tmp.write(text)
       tmp.flush
-      system %{vim --clientserver "#@clientserver" --servername "#@server_name" --remote-send "<ESC>:r #{tmp.path}<CR>"}
+      result = system %{
+        vim --clientserver "#@clientserver" --servername "#@server_name" --remote-send "<ESC>:r #{tmp.path}<CR>"
+      }
+      unless result
+        STDERR.puts <<~EOT
+          Failed! vim is required in path and running with server name "#@server_name".
+        EOT
+        return
+      end
     end
+    self
   end
 
   # Returns the current column position of the cursor in the Vim server

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.54 ruby lib
+# stub: ollama_chat 0.0.56 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.54".freeze
+  s.version = "0.0.56".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -13,18 +13,18 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/input_content.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_editing.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
-  s.rubygems_version = "4.0.2".freeze
+  s.rubygems_version = "4.0.3".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
-  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.3".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.17.0".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -50,5 +50,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
   s.add_runtime_dependency(%q<csv>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<const_conf>.freeze, ["~> 0.3".freeze])
-  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.1".freeze])
+  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.5".freeze])
 end

data/spec/ollama_chat/chat_spec.rb

@@ -28,6 +28,11 @@ describe OllamaChat::Chat, protect_env: true do
   describe 'handle_input' do
     connect_to_ollama_server
 
+    it 'returns :next when input is "/reconnect"' do
+      expect(chat).to receive(:connect_ollama).and_return double('ollama')
+      expect(chat.handle_input("/reconnect")).to eq :next
+    end
+
     it 'returns :next when input is "/copy"' do
       expect(chat).to receive(:copy_to_clipboard)
       expect(chat.handle_input("/copy")).to eq :next

data/spec/ollama_chat/input_content_spec.rb

@@ -9,9 +9,12 @@ describe OllamaChat::InputContent do
 
   describe '#input' do
     it 'can read content from a selected file' do
+      selected_filename = 'spec/assets/example.rb'
       # Mock the file selection process
-      expect(chat).to receive(:choose_filename).with('**/*').
-        and_return('spec/assets/example.rb')
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[]).
+        and_return(selected_filename)
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[selected_filename]).
+        and_return nil
 
       # Test that it returns the file content
       result = chat.input(nil)
@@ -19,13 +22,19 @@ describe OllamaChat::InputContent do
     end
 
     it 'returns nil when no file is selected' do
-      expect(chat).to receive(:choose_filename).with('**/*').and_return(nil)
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[]).
+        and_return(nil)
       expect(chat.input(nil)).to be_nil
     end
 
     it 'can read content with specific pattern' do
-      expect(chat).to receive(:choose_filename).with('spec/assets/*').
-        and_return('spec/assets/example.rb')
+      selected_filename = 'spec/assets/example.rb'
+      expect(chat).to receive(:choose_filename).
+        with('spec/assets/*', chosen: Set[]).
+        and_return(selected_filename)
+      expect(chat).to receive(:choose_filename).
+        with('spec/assets/*', chosen: Set[selected_filename]).
+        and_return nil
       result = chat.input('spec/assets/*')
       expect(result).to include('puts "Hello World!"')
     end
@@ -108,7 +117,7 @@ describe OllamaChat::InputContent do
     it 'handles missing editor gracefully' do
       const_conf_as('OllamaChat::EnvConfig::EDITOR' => nil)
 
-      expect(STDERR).to receive(:puts).with(/Editor reqired for compose/)
+      expect(STDERR).to receive(:puts).with(/Editor required for compose/)
       expect(chat.compose).to be_nil
     end
 

data/spec/ollama_chat/parsing_spec.rb

@@ -49,24 +49,7 @@ describe OllamaChat::Parsing do
         def io.content_type
           'text/csv'
         end
-        expect(chat.parse_source(io)).to eq(<<EOT)
-  name: John Doe
-  age: 32
-  occupation: Software Engineer
-
-  name: Jane Smith
-  age: 28
-  occupation: Marketing Manager
-
-  name: Bob Johnson
-  age: 45
-  occupation: Retired
-
-  name: Alice Brown
-  age: 25
-  occupation: Student
-
-EOT
+        expect(chat.parse_source(io)).to eq(asset_content('example.csv'))
       end
     end
 

data/spec/ollama_chat/think_control_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+describe OllamaChat::ThinkControl do
+  let :chat do
+    OllamaChat::Chat.new(
+      argv: %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
+    )
+  end
+
+  connect_to_ollama_server
+
+  describe '#think' do
+    it 'returns the current think mode state' do
+      expect(chat.think).to be false
+      chat.instance_variable_set(:@think, true)
+      expect(chat.think).to be true
+      chat.instance_variable_set(:@think, false)
+      expect(chat.think).to be false
+      chat.instance_variable_set(:@think, 'low')
+      expect(chat.think).to eq 'low'
+    end
+  end
+
+  describe '#think?' do
+    it 'returns true when think mode is enabled (boolean true)' do
+      chat.instance_variable_set(:@think, true)
+      expect(chat.think?).to be true
+    end
+
+    it 'returns true when think mode is enabled (string value)' do
+      chat.instance_variable_set(:@think, 'high')
+      expect(chat.think?).to be true
+    end
+
+    it 'returns false when think mode is disabled (boolean false)' do
+      chat.instance_variable_set(:@think, false)
+      expect(chat.think?).to be false
+    end
+
+    it 'returns false when think mode is nil' do
+      chat.instance_variable_set(:@think, nil)
+      expect(chat.think?).to be false
+    end
+  end
+
+  describe '#think_mode' do
+    it 'returns "enabled" when think is true' do
+      chat.instance_variable_set(:@think, true)
+      expect(chat.think_mode).to eq 'enabled'
+    end
+
+    it 'returns the think value when it is a string' do
+      chat.instance_variable_set(:@think, 'medium')
+      expect(chat.think_mode).to eq 'medium'
+    end
+
+    it 'returns "disabled" when think is false' do
+      chat.instance_variable_set(:@think, false)
+      expect(chat.think_mode).to eq 'disabled'
+    end
+
+    it 'returns "disabled" when think is nil' do
+      chat.instance_variable_set(:@think, nil)
+      expect(chat.think_mode).to eq 'disabled'
+    end
+  end
+
+  describe '#think_show' do
+    it 'displays the current think mode status' do
+      chat.instance_variable_set(:@think, true)
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1menabled\e\[0m\./)
+      chat.think_show
+    end
+
+    it 'displays the think mode level when set to string' do
+      chat.instance_variable_set(:@think, 'high')
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mhigh\e\[0m\./)
+      chat.think_show
+    end
+
+    it 'displays "disabled" when think is false' do
+      chat.instance_variable_set(:@think, false)
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
+      chat.think_show
+    end
+
+    it 'displays "disabled" when think is nil' do
+      chat.instance_variable_set(:@think, nil)
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
+      chat.think_show
+    end
+  end
+
+  describe '#think_loud?' do
+    it 'returns false when think is disabled' do
+      chat.instance_variable_set(:@think, false)
+      expect(chat.think_loud?).to be false
+    end
+
+    it 'returns false when think_loud is off' do
+      chat.instance_variable_set(:@think, true)
+      allow(chat).to receive(:think_loud).and_return(double(on?: false))
+      expect(chat.think_loud?).to be false
+    end
+
+    it 'returns true when both think and think_loud are enabled' do
+      chat.instance_variable_set(:@think, true)
+      allow(chat).to receive(:think_loud).and_return(double(on?: true))
+      expect(chat.think_loud?).to be true
+    end
+  end
+
+  describe '#choose_think_mode' do
+    it 'can select "off" mode' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('off')
+      chat.choose_think_mode
+      expect(chat.think).to be false
+    end
+
+    it 'can select "on" mode' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('on')
+      chat.choose_think_mode
+      expect(chat.think).to be true
+    end
+
+    it 'can select "low" mode' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('low')
+      chat.choose_think_mode
+      expect(chat.think).to eq 'low'
+    end
+
+    it 'can select "medium" mode' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('medium')
+      chat.choose_think_mode
+      expect(chat.think).to eq 'medium'
+    end
+
+    it 'can select "high" mode' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('high')
+      chat.choose_think_mode
+      expect(chat.think).to eq 'high'
+    end
+
+    it 'can exit selection' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('[EXIT]')
+      expect { chat.choose_think_mode }.not_to change { chat.think }
+    end
+
+    it 'can handle nil selection' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return(nil)
+      expect { chat.choose_think_mode }.not_to change { chat.think }
+    end
+  end
+end

data/spec/ollama_chat/vim_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe OllamaChat::Vim do
+  let(:server_name) { 'TEST_SERVER' }
+  let(:vim) { described_class.new(server_name) }
+
+  describe '#initialize' do
+    it 'can be initialized with a server name' do
+      expect(vim.server_name).to eq server_name
+    end
+
+    it 'can be initialized without a server name' do
+      vim_without_name = described_class.new(nil)
+      expect(vim_without_name.server_name).to be_a(String)
+    end
+
+    it 'uses socket as default clientserver protocol' do
+      expect(vim.clientserver).to eq 'socket'
+    end
+
+    it 'can specify clientserver protocol' do
+      vim_with_protocol = described_class.new(server_name, clientserver: 'pipe')
+      expect(vim_with_protocol.clientserver).to eq 'pipe'
+    end
+  end
+
+  describe '.default_server_name' do
+    it 'generates a standardized server name from a directory' do
+      name = described_class.default_server_name('/path/to/project')
+      expect(name).to match(/\A[A-Z0-9]+-[A-Z0-9]+\z/)
+      expect(name).to include('PROJECT')
+    end
+
+    it 'handles current working directory' do
+      name = described_class.default_server_name
+      expect(name).to be_a(String)
+      expect(name).to_not be_empty
+    end
+
+    it 'generates consistent names for same path' do
+      name1 = described_class.default_server_name('/tmp/test')
+      name2 = described_class.default_server_name('/tmp/test')
+      expect(name1).to eq name2
+    end
+  end
+
+  describe '#insert' do
+    it 'can insert text into vim' do
+      expect(vim).to receive(:`).with(
+        /vim.*--remote-expr.*col\('\.'\)/
+      ).and_return("5\n")
+      # Mock the system call to avoid actual vim interaction
+      expect(vim).to receive(:system).with(
+        /vim.*--servername.*#{server_name}.*--remote-send/
+      )
+      vim.insert('test content')
+    end
+
+    it 'handles text indentation' do
+      # Mock the col method to return a specific column
+      expect(vim).to receive(:`).with(
+        /vim.*--remote-expr.*col\('\.'\)/).and_return("5\n"
+                                                     )
+      tmp = double('Tempfile', flush: true, path: '/tmp/test')
+      expect(Tempfile).to receive(:open).and_yield(tmp)
+      expect(tmp).to receive(:write).with('    test content')
+      expect(vim).to receive(:system).with(
+        /vim --clientserver.*--servername.*--remote-send.*\/tmp\/test/
+      ).and_return true
+      vim.insert('test content')
+    end
+  end
+
+  describe '#col' do
+    it 'can get current column position' do
+      # Mock the system call to return a specific column
+      expect(vim).to receive(:`).with(
+        /vim.*--remote-expr.*col\('\.'\)/
+      ).and_return("5\n")
+      expect(vim.col).to eq 5
+    end
+
+    it 'handles empty response' do
+      expect(vim).to receive(:`).and_return("\n")
+      expect(vim.col).to eq 0
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.56
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -385,14 +385,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 description: |
   The app provides a command-line interface (CLI) to an Ollama AI model,
   allowing users to engage in text-based conversations and generate
@@ -517,9 +517,11 @@ files:
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
+- spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb
 - spec/ollama_chat/utils/fetcher_spec.rb
 - spec/ollama_chat/utils/file_argument_spec.rb
+- spec/ollama_chat/vim_spec.rb
 - spec/ollama_chat/web_searching_spec.rb
 - spec/spec_helper.rb
 - tmp/.keep
@@ -545,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files:
@@ -565,8 +567,10 @@ test_files:
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
+- spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb
 - spec/ollama_chat/utils/fetcher_spec.rb
 - spec/ollama_chat/utils/file_argument_spec.rb
+- spec/ollama_chat/vim_spec.rb
 - spec/ollama_chat/web_searching_spec.rb
 - spec/spec_helper.rb