ollama_chat 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905c1baa33dc4adfae423a2d7e026e6cb266bde4d629476f96767440d26d7e62
-  data.tar.gz: ab371250b1fe5cfbd0957ce22d40887658c7a11cb52beb2940ecf3cd99bf88ac
+  metadata.gz: a08d4184578d406a8e5d02823cbd5fc0c1999591f86f715b99637b9a263ba7f4
+  data.tar.gz: 2cdbb7c09d8de378fc58b292e4d2e29ba6849f3b9c3f1bb742ba658ec6b997e0
 SHA512:
-  metadata.gz: b372485a4e39a47583f30391bf036a2e193d75d9dd233d07cdc506c68a5119c5e2d11bce7ad081f6eae5988b4cf967ba001d6f232d26655d9ac0c0917cf0878e
-  data.tar.gz: 2d708c9eb72e6bfd4df164aa91509b6305d1956322b81d58c49431d8d3296d6c5a2f64001962e2fefb1edcf80c2d858fceb13a7781ab21a76e8512ae4bd440eb
+  metadata.gz: da10d3bd76363f8856a0e35dfe927084374025c3e87a9e531d02ba07bcaa214e057a649ab9c3c46057947e651f8ca616344a1de30bcecc1d64fe4e8c13df3893
+  data.tar.gz: c2944a6a328e5a1833d4becfe9842dbdd6b4d223bb36903b22254914d22ec19eadcc7942f0e4ba0d6a11d0fccfb4d41f3bf5624019901fb594e652aeacd70c21

data/.contexts/full.rb

@@ -0,0 +1,25 @@
+context do
+  variable project_name: Pathname.pwd.basename
+
+  variable project_version: File.read('VERSION').chomp
+
+  variable branch: `git rev-parse --abbrev-ref HEAD`.chomp
+
+  namespace "structure" do
+    command "tree lib", tags: %w[ project_structure ]
+  end
+
+  namespace "lib" do
+    Dir['lib/**/*.rb'].each do |filename|
+      file filename, tags: 'lib'
+    end
+  end
+
+  file 'Rakefile',  tags: 'gem_hadar'
+
+  file 'README.md', tags: 'documentation'
+
+  meta ruby: RUBY_DESCRIPTION
+
+  meta code_coverage: json('coverage/coverage_context.json')
+end

data/.contexts/info.rb

@@ -0,0 +1,17 @@
+context do
+  variable project_name: Pathname.pwd.basename
+
+  variable project_version: File.read('VERSION').chomp
+
+  variable branch: `git rev-parse --abbrev-ref HEAD`.chomp
+
+  namespace "structure" do
+    command "tree lib", tags: %w[ project_structure ]
+  end
+
+  file 'Rakefile',  tags: 'gem_hadar'
+
+  file 'README.md', tags: 'documentation'
+
+  meta ruby: RUBY_DESCRIPTION
+end

data/.contexts/lib.rb

@@ -0,0 +1,23 @@
+context do
+  variable project_name: Pathname.pwd.basename
+
+  variable project_version: File.read('VERSION').chomp
+
+  variable branch: `git rev-parse --abbrev-ref HEAD`.chomp
+
+  namespace "structure" do
+    command "tree lib", tags: %w[ project_structure ]
+  end
+
+  namespace "lib" do
+    Dir['lib/**/*.rb'].each do |filename|
+      file filename, tags: 'lib'
+    end
+  end
+
+  file 'Rakefile',  tags: 'gem_hadar'
+
+  meta ruby: RUBY_DESCRIPTION
+
+  meta code_coverage: json('coverage/coverage_context.json')
+end

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 2025-08-18 v0.0.25
+
+- Integrated `context_spook` gem as development dependency
+- Added new context files: `.contexts/full.rb`, `.contexts/info.rb`, and
+  `.contexts/lib.rb`
+- Updated `ollama-ruby` dependency version constraint from `~> 1.2` to `~> 1.6`
+- Bumped **tins** dependency from ~> **1.34** to ~> **1.41**
+- Refactored `web` method in `chat.rb` to conditionally handle embeddings
+- Split web prompt templates into `web_embed` and `web_import`
+- Moved cache check message to display before cache retrieval
+- Fixed `show_last` behavior for empty lists with comprehensive tests
+- Added nil check to `kramdown_ansi_parse` method to prevent `NoMethodError`
+- Added documentation comments to `OllamaChat::Clipboard`,
+  `OllamaChat::Dialog`, `OllamaChat::Utils::Chooser`, and
+  `OllamaChat::Utils::FileArgument` modules
+- Added new command line option `-d DIR` to specify runtime directory for
+  socket file
+- Updated `OllamaChat::ServerSocket.send_to_server_socket` method to accept
+  `runtime_dir` parameter
+- Modified `create_socket_server` method to use provided `runtime_dir` when
+  creating Unix socket server
+- Updated help text to document the new `-d` option
+- Added separate context for `runtime_dir` parameter testing in spec
+
 ## 2025-08-17 v0.0.24
 
 - Updated `kramdown-ansi` dependency version constraint from **0.0** to **0.1**

data/README.md

@@ -227,6 +227,14 @@ The `ollama_chat_send` command now supports additional parameters to enhance fun
   $ echo "Visit https://example.com for more info" | ollama_chat_send -p
   ```
 
+- **Runtime Directory (`-d`)**: Specifies the directory where the Unix socket
+  file of `ollama_chat` was created, if you want to send to a specific
+  `ollama_chat`.
+
+  ```bash
+  $ echo "Hello world" | ollama_chat_send -d /tmp/my_runtime_dir -r
+  ```
+
 - **Help (`-h` or `--help`)**: Displays usage information and available options.
 
   ```bash

data/Rakefile

@@ -30,7 +30,7 @@ GemHadar do
   executables << 'ollama_chat' << 'ollama_chat_send'
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.2'
+  dependency             'ollama-ruby',           '~> 1.6'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
   dependency             'unix_socks',            '>= 0.0.1'
   dependency             'rss',                   '~> 0.3'
@@ -41,7 +41,7 @@ GemHadar do
   dependency             'xdg'
   dependency             'kramdown-ansi',         '~> 0.1'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
-  dependency             'tins',                  '~> 1.34'
+  dependency             'tins',                  '~> 1.41'
   dependency             'search_ui',             '~> 0.0'
   dependency             'amatch',                '~> 0.4.1'
   dependency             'pdf-reader',            '~> 2.0'
@@ -52,6 +52,7 @@ GemHadar do
   development_dependency 'webmock'
   development_dependency 'debug'
   development_dependency 'simplecov'
+  development_dependency 'context_spook'
 
   licenses << 'MIT'
   

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/bin/ollama_chat_send

@@ -5,7 +5,7 @@ require 'tins/go'
 include Tins::GO
 
 
-opts = go 'f:rtph', ARGV
+opts = go 'f:d:rtph', ARGV
 
 def usage(rc = 0)
   puts <<~EOT
@@ -16,6 +16,7 @@ def usage(rc = 0)
       -t         Send input as terminal input including commands, e. g. /import
       -p         Send input with source parsing enabled (defaults to disabled)
       -f CONFIG  file to read
+      -d DIR     the runtime directory to look for the socket file
       -h         Show this help message
 
     Send data to a running Ollame Chat client via standard input.
@@ -31,7 +32,13 @@ begin
          else
            opts[?r] ? :socket_input_with_response : :socket_input
          end
-  response = OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:, config:, parse: !!opts[?p])
+  response = OllamaChat::ServerSocket.send_to_server_socket(
+    STDIN.read,
+    type:,
+    config:,
+    runtime_dir: opts[?d],
+    parse: !!opts[?p]
+  )
   type == :socket_input_with_response and puts response.content
 rescue => e
   warn "Caught #{e.class}: #{e}"

data/lib/ollama_chat/chat.rb

@@ -348,23 +348,34 @@ class OllamaChat::Chat
     end
   end
 
-  # The web method searches for URLs based on a query and processes them by
-  # fetching, embedding, and summarizing their content, then formats the
-  # results into a prompt string.
+  # The web method performs a web search and processes the results based on
+  # embedding configuration.
   #
-  # @param count [ String ] the number of URLs to search for
+  # It searches for the given query using the configured search engine and
+  # processes up to the specified number of URLs. If embeddings are enabled, it
+  # embeds each result and interpolates the query into the web_embed prompt.
+  # Otherwise, it imports each result and interpolates both the query and
+  # results into the web_import prompt.
+  #
+  # @param count [ String ] the maximum number of search results to process
   # @param query [ String ] the search query string
   #
-  # @return [ String ] the formatted prompt string containing the query and summarized results
+  # @return [ String, Symbol ] the interpolated prompt content or :next if no URLs were found
   def web(count, query)
-    urls            = search_web(query, count.to_i) or return :next
-    urls.each do |url|
-      fetch_source(url) { |url_io| embed_source(url_io, url) }
+    urls = search_web(query, count.to_i) or return :next
+    if @embedding.on?
+      prompt = config.prompts.web_embed
+      urls.each do |url|
+        fetch_source(url) { |url_io| embed_source(url_io, url) }
+      end
+      prompt.named_placeholders_interpolate({query:})
+    else
+      prompt = config.prompts.web_import
+      results = urls.each_with_object('') do |url, content|
+        import(url).full? { |c| content << c }
+      end
+      prompt.named_placeholders_interpolate({query:, results:})
     end
-    urls_summarized = urls.map { summarize(_1) }
-    results = urls.zip(urls_summarized).
-      map { |u, s| "%s as \n:%s" % [ u, s ] } * "\n\n"
-    config.prompts.web % { query:, results: }
   end
 
   # The manage_links method handles operations on a collection of links, such

data/lib/ollama_chat/clipboard.rb

@@ -1,3 +1,15 @@
+# A module that provides clipboard functionality for copying and pasting chat
+# messages.
+#
+# This module enables users to copy the last assistant message to the system
+# clipboard and paste content from input, facilitating easy transfer of
+# conversation content between different applications and contexts.
+#
+# @example Copying a message to clipboard
+#   chat.copy_to_clipboard
+#
+# @example Pasting content from input
+#   content = chat.paste_from_input
 module OllamaChat::Clipboard
   # Copy the last assistant's message to the system clipboard.
   #

data/lib/ollama_chat/dialog.rb

@@ -1,3 +1,20 @@
+# A module that provides interactive selection and configuration functionality
+# for OllamaChat.
+#
+# The Dialog module encapsulates various helper methods for choosing models,
+# system prompts, document policies, and voices, as well as displaying
+# information and managing chat sessions. It leverages user interaction
+# components like choosers and prompts to enable dynamic configuration during
+# runtime.
+#
+# @example Selecting a model from available options
+#   chat.choose_model('-m llama3.1', 'llama3.1')
+#
+# @example Changing the system prompt
+#   chat.change_system_prompt('default_prompt', system: '?sherlock')
+#
+# @example Choosing a document policy
+#   chat.choose_document_policy
 module OllamaChat::Dialog
   # The model_with_size method formats a model's size for display
   # by creating a formatted string that includes the model name and its size

data/lib/ollama_chat/kramdown_ansi.rb

@@ -21,11 +21,13 @@ module OllamaChat::KramdownANSI
   # content with appropriate terminal formatting based on the application's
   # styling configuration.
   #
-  # @param content [ String ] the raw content to be parsed and formatted
+  # @param content [ String, nil ] the raw content to be parsed and formatted.
+  #   If nil, returns an empty string.
   #
   # @return [ String ] the content formatted with ANSI escape sequences
   # according to the configured styles
   def kramdown_ansi_parse(content)
+    content.nil? and return ''
     Kramdown::ANSI.parse(content, ansi_styles: @kramdown_ansi_styles)
   end
 end

data/lib/ollama_chat/message_list.rb

@@ -113,7 +113,7 @@ class OllamaChat::MessageList
   # @return [ OllamaChat::MessageList ] returns the instance of the class
   def show_last
     message = last
-    message&.role == 'user' and return
+    !message || message.role == 'user' and return
     use_pager do |output|
       output.puts message_text_for(message)
     end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -21,8 +21,10 @@ prompts:
     %{words} words:
 
     %{source_content}
-  web: |
-    Answer the the query %{query} using these sources and summaries:
+  web_embed: |
+    Answer the the query %{query} using the provided chunks.
+  web_import: |
+    Answer the the query %{query} using these imported source:
 
     %{results}
   location: You are at %{location_name}, %{location_decimal_degrees}, on %{localtime}, preferring %{units}

data/lib/ollama_chat/server_socket.rb

@@ -13,12 +13,13 @@ module OllamaChat::ServerSocket
     # @param content [ String ] the message content to be sent
     # @param config [ ComplexConfig::Settings ] the configuration object containing server settings
     # @param type [ Symbol ] the type of message transmission, defaults to :socket_input
+    # @param runtime_dir [ String ] pathname to runtime_dir of socket file
     # @param parse [ TrueClass, FalseClass ] whether to parse the response, defaults to false
     #
     # @return [ UnixSocks::Message, nil ] the response from transmit_with_response if type
     # is :socket_input_with_response, otherwise nil
-    def send_to_server_socket(content, config:, type: :socket_input, parse: false)
-      server  = create_socket_server(config:)
+    def send_to_server_socket(content, config:, type: :socket_input, runtime_dir: nil, parse: false)
+      server  = create_socket_server(config:, runtime_dir:)
       message = { content:, type:, parse: }
       if type.to_sym == :socket_input_with_response
         server.transmit_with_response(message)
@@ -43,7 +44,10 @@ module OllamaChat::ServerSocket
     #
     # @return [UnixSocks::Server] a configured Unix domain socket server
     # instance ready to receive messages
-    def create_socket_server(config:)
+    def create_socket_server(config:, runtime_dir: nil)
+      if runtime_dir
+        return UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
+      end
       if runtime_dir = config.server_socket_runtime_dir
         UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
       else

data/lib/ollama_chat/source_fetching.rb

@@ -110,7 +110,6 @@ module OllamaChat::SourceFetching
     end
   end
 
-
   # Summarizes content from the given source IO and source identifier.
   #
   # This method takes an IO object containing document content and generates a
@@ -146,7 +145,6 @@ module OllamaChat::SourceFetching
     end
   end
 
-
   # Embeds content from the given source IO and source identifier.
   #
   # This method processes document content by splitting it into chunks using

data/lib/ollama_chat/utils/chooser.rb

@@ -2,6 +2,22 @@ require 'amatch'
 require 'search_ui'
 require 'term/ansicolor'
 
+# A module that provides interactive selection functionality using fuzzy
+# matching and search capabilities.
+#
+# The Chooser module enables users to interactively select items from a list
+# using a search interface with fuzzy matching. It leverages the Amatch library
+# for similarity matching and SearchUI for the interactive display and
+# selection experience.
+#
+# @example Using the chooser in an interactive menu
+#   entries = ['apple', 'banana', 'cherry']
+#   selected = OllamaChat::Utils::Chooser.choose(entries, prompt: 'Choose a fruit:')
+#
+# @example Returning immediately if only one entry exists
+#   entries = ['single_option']
+#   result = OllamaChat::Utils::Chooser.choose(entries, return_immediately: true)
+#   # Returns 'single_option' directly without user interaction
 module OllamaChat::Utils::Chooser
   class << self
     include SearchUI

data/lib/ollama_chat/utils/fetcher.rb

@@ -51,8 +51,8 @@ class OllamaChat::Utils::Fetcher
   def self.get(url, headers: {}, **options, &block)
     cache = options.delete(:cache) and
       cache = OllamaChat::Utils::CacheFetcher.new(cache)
+    cache and infobar.puts "Getting #{url.to_s.inspect} from cache."
     if result = cache&.get(url, &block)
-      infobar.puts "Getting #{url.to_s.inspect} from cache."
       return result
     else
       new(**options).send(:get, url, headers:) do |tmp|

data/lib/ollama_chat/utils/file_argument.rb

@@ -1,3 +1,22 @@
+# A module that provides functionality for handling file arguments and content
+# retrieval.
+#
+# The FileArgument module offers methods to process either file paths or direct
+# string content, determining whether the input represents a file that should
+# be read or if it's already a string of content to be used directly. It also
+# includes logic to handle default values when no valid input is provided.
+#
+# @example Retrieving file contents or using direct content
+#   FileArgument.get_file_argument('path/to/file.txt')
+#   # Returns the contents of the file if it exists
+#
+# @example Using a string as content
+#   FileArgument.get_file_argument('direct content string')
+#   # Returns the string itself
+#
+# @example Providing a default value
+#   FileArgument.get_file_argument(nil, default: 'fallback content')
+#   # Returns 'fallback content' when no valid input is given
 module OllamaChat::Utils::FileArgument
   module_function
 

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.24'
+  VERSION         = '0.0.25'
   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.24 ruby lib
+# stub: ollama_chat 0.0.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.24".freeze
+  s.version = "0.0.25".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -13,14 +13,14 @@ 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/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.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/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.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 = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".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/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.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/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.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/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/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/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 = [".all_images.yml".freeze, ".contexts/full.rb".freeze, ".contexts/info.rb".freeze, ".contexts/lib.rb".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".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/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.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/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.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/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/kramdown_ansi_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/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.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.1".freeze)
   s.rubygems_version = "3.6.9".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/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/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/kramdown_ansi_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/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.specification_version = 4
 
@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<context_spook>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.2".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.6".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.0.1".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
@@ -43,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<xdg>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.1".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
-  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.34".freeze])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.41".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
   s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4.1".freeze])
   s.add_runtime_dependency(%q<pdf-reader>.freeze, ["~> 2.0".freeze])

data/spec/ollama_chat/kramdown_ansi_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe OllamaChat::KramdownANSI do
+  let :chat do
+    double('Chat').extend(described_class)
+  end
+
+  describe '#configure_kramdown_ansi_styles' do
+    it 'can be configured via env var' do
+      allow(ENV).to receive(:key?).with('KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES').and_return(true)
+      allow(ENV).to receive(:key?).with('KRAMDOWN_ANSI_STYLES').and_return(false)
+
+      styles = { bold: '1' }
+      expect(Kramdown::ANSI::Styles).to receive(:from_env_var).
+        with('KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES').
+        and_return(double(ansi_styles: styles))
+
+      expect(chat.configure_kramdown_ansi_styles).to eq(styles)
+    end
+
+    it 'has a default configuration' do
+      allow(ENV).to receive(:key?).with('KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES').and_return(false)
+      allow(ENV).to receive(:key?).with('KRAMDOWN_ANSI_STYLES').and_return(false)
+
+      expect(chat.configure_kramdown_ansi_styles).to be_a(Hash)
+    end
+  end
+
+  describe '#kramdown_ansi_parse' do
+    it 'can parse markdown' do
+      content = "# Header\n\nParagraph text"
+      result = chat.kramdown_ansi_parse(content)
+
+      expect(result).to be_a(String)
+    end
+
+    it 'handles empty string correctly' do
+      expect(chat.kramdown_ansi_parse('')).to eq ''
+    end
+
+    it 'handles nil correctly' do
+      expect(chat.kramdown_ansi_parse(nil)).to eq ''
+    end
+  end
+end

data/spec/ollama_chat/message_list_spec.rb

@@ -71,6 +71,32 @@ describe OllamaChat::MessageList do
     FileUtils.rm_f 'tmp/test-conversation.json'
   end
 
+
+  describe '.show_last' do
+    it 'shows nothing when there are no messages' do
+      empty_list = described_class.new(chat)
+      expect { empty_list.show_last }.not_to raise_error
+      expect(empty_list.show_last).to be nil
+    end
+
+    it 'shows nothing when the last message is by the assistant' do
+      list = described_class.new(chat)
+      allow(chat).to receive(:think).and_return(double(on?: false))
+      allow(chat).to receive(:markdown).and_return(double(on?: false))
+      list <<  Ollama::Message.new(role: 'assistant', content: 'hello')
+      expect(STDOUT).to receive(:puts).
+        with("📨 \e[1m\e[38;5;111massistant\e[0m\e[0m:\nhello\n")
+      expect(list.show_last).to be_a described_class
+    end
+
+    it 'shows nothing when the last message is by the user' do
+      list = described_class.new(chat)
+      list <<  Ollama::Message.new(role: 'user', content: 'world')
+      expect { list.show_last }.not_to raise_error
+      expect(list.show_last).to be nil
+    end
+  end
+
   context 'without pager' do
     before do
       expect(list).to receive(:determine_pager_command).and_return nil

data/spec/ollama_chat/server_socket_spec.rb

@@ -9,75 +9,96 @@ describe OllamaChat::ServerSocket do
     let(:config) { double('Config') }
     let(:server) { double('Server') }
 
-    before do
-      expect(OllamaChat::ServerSocket).to receive(:create_socket_server).with(config: config).and_return(server)
-    end
+    context 'without runtime_dir' do
 
-    context 'with default parameters' do
-      it 'uses correct defaults' do
-        message = { content: 'test', type: :socket_input, parse: false }
+      before do
+        expect(OllamaChat::ServerSocket).to receive(:create_socket_server).
+          with(config: config, runtime_dir: nil).and_return(server)
+      end
 
-        expect(server).to receive(:transmit).with(message).and_return(nil)
+      context 'with default parameters' do
+        it 'uses correct defaults' do
+          message = { content: 'test', type: :socket_input, parse: false }
 
-        result = OllamaChat::ServerSocket.send_to_server_socket('test', config: config)
+          expect(server).to receive(:transmit).with(message).and_return(nil)
 
-        expect(result).to be_nil
+          result = OllamaChat::ServerSocket.send_to_server_socket('test', config: config)
+
+          expect(result).to be_nil
+        end
       end
-    end
 
-    context 'with :socket_input type and parse: true' do
-      it 'sends message with parse flag and returns nil' do
-        message = { content: 'test', type: :socket_input, parse: true }
+      context 'with :socket_input type and parse: true' do
+        it 'sends message with parse flag and returns nil' do
+          message = { content: 'test', type: :socket_input, parse: true }
 
-        expect(server).to receive(:transmit).with(message).and_return(nil)
+          expect(server).to receive(:transmit).with(message).and_return(nil)
 
-        result = OllamaChat::ServerSocket.send_to_server_socket(
-          'test',
-          config: config,
-          type: :socket_input,
-          parse: true
-        )
+          result = OllamaChat::ServerSocket.send_to_server_socket(
+            'test',
+            config: config,
+            type: :socket_input,
+            parse: true
+          )
 
-        expect(result).to be_nil
+          expect(result).to be_nil
+        end
       end
-    end
 
-    context 'with :socket_input_with_response type and parse: false' do
-      it 'sends message and returns response with parse flag' do
-        message = { content: 'test', type: :socket_input_with_response, parse: false }
-        response = double('Response')
+      context 'with :socket_input_with_response type and parse: false' do
+        it 'sends message and returns response with parse flag' do
+          message = { content: 'test', type: :socket_input_with_response, parse: false }
+          response = double('Response')
 
-        expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+          expect(server).to receive(:transmit_with_response).with(message).and_return(response)
 
-        result = OllamaChat::ServerSocket.send_to_server_socket(
-          'test',
-          config: config,
-          type: :socket_input_with_response,
-          parse: false
-        )
+          result = OllamaChat::ServerSocket.send_to_server_socket(
+            'test',
+            config: config,
+            type: :socket_input_with_response,
+            parse: false
+          )
 
-        expect(result).to eq(response)
+          expect(result).to eq(response)
+        end
       end
-    end
 
-    context 'with :socket_input_with_response type and parse: true' do
-      it 'sends message and returns response with parse flag' do
-        message = { content: 'test', type: :socket_input_with_response, parse: true }
-        response = double('Response')
+      context 'with :socket_input_with_response type and parse: true' do
+        it 'sends message and returns response with parse flag' do
+          message = { content: 'test', type: :socket_input_with_response, parse: true }
+          response = double('Response')
 
-        expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+          expect(server).to receive(:transmit_with_response).with(message).and_return(response)
 
-        result = OllamaChat::ServerSocket.send_to_server_socket(
-          'test',
-          config: config,
-          type: :socket_input_with_response,
-          parse: true
-        )
+          result = OllamaChat::ServerSocket.send_to_server_socket(
+            'test',
+            config: config,
+            type: :socket_input_with_response,
+            parse: true
+          )
 
-        expect(result).to eq(response)
+          expect(result).to eq(response)
+        end
       end
     end
 
+    context 'with runtime_dir parameter' do
+      before do
+        expect(OllamaChat::ServerSocket).to receive(:create_socket_server).
+          with(config: config, runtime_dir: '/foo/bar').and_return(server)
+      end
+
+      it 'uses correct defaults' do
+        message = { content: 'test', type: :socket_input, parse: false }
+
+        expect(server).to receive(:transmit).with(message).and_return(nil)
+
+
+        result = OllamaChat::ServerSocket.send_to_server_socket('test', config: config, runtime_dir: '/foo/bar')
+
+        expect(result).to be_nil
+      end
+    end
   end
 
   describe '#create_socket_server' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Florian Frank
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: context_spook
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -293,14 +307,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.34'
+        version: '1.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.34'
+        version: '1.41'
 - !ruby/object:Gem::Dependency
   name: search_ui
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +414,9 @@ extra_rdoc_files:
 - lib/ollama_chat/web_searching.rb
 files:
 - ".all_images.yml"
+- ".contexts/full.rb"
+- ".contexts/info.rb"
+- ".contexts/lib.rb"
 - ".envrc"
 - ".gitignore"
 - CHANGES.md
@@ -460,6 +477,7 @@ files:
 - spec/ollama_chat/clipboard_spec.rb
 - spec/ollama_chat/follow_chat_spec.rb
 - spec/ollama_chat/information_spec.rb
+- spec/ollama_chat/kramdown_ansi_spec.rb
 - spec/ollama_chat/message_list_spec.rb
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
@@ -504,6 +522,7 @@ test_files:
 - spec/ollama_chat/clipboard_spec.rb
 - spec/ollama_chat/follow_chat_spec.rb
 - spec/ollama_chat/information_spec.rb
+- spec/ollama_chat/kramdown_ansi_spec.rb
 - spec/ollama_chat/message_list_spec.rb
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb