ollama_chat 0.0.42 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1136200c7d140c7f9509710887e6e0c490336046306a7447ef61dc11f523622
-  data.tar.gz: d9275c4b1b86ba2ac94e7a4d6956c87899481abd34d1471e6d77be7c21ef810b
+  metadata.gz: d0c9a525754d546b6d7cd0fa88e20c4767bd1dae51313d1f2c2409c06762f4b0
+  data.tar.gz: fc9ddde83495908f965c9225246b6668b01c40fe7391fb83c54beb3ce46321d2
 SHA512:
-  metadata.gz: 8dee06aacfff1af99076ae81d509f913a61f539071553f6f86af96b3ee0fb3d1c63f39307d85525ff0f14a382ef44bc35132e7930b10589f062b6a40973cc8e3
-  data.tar.gz: b0388f8ac5e679f3ffec9e28008a4f9558d2b09c3c73ebedd58b6821fb6cca62dd25aa16712c29ff36c5117cfbd77bf55f5c48b2412993aa70e650fae1326217
+  metadata.gz: 97dc5c42b59b3f0d7abf50a0647ff3a3c79681e88e4e9b61c37f706fadc450731ed0240795362e6a061f07ada56502934f5992e796c602b01c27f3b20e6c575f
+  data.tar.gz: 34c1f4dded9b54155b407913290354707cb63104b3ea126ca438a245d03458ee868962068f85398954cf6be0ff17f826bdc627985168817d55642cb231732459

data/CHANGES.md

@@ -1,5 +1,57 @@
 # Changes
 
+## 2025-12-10 v0.0.44
+
+- Fixed `stream` option in `spec/ollama_chat/follow_chat_spec.rb` from `on?
+  true` to `on?: true`
+- Extracted `prepare_last_message` method to handle content and thinking text
+  formatting with markdown and annotation support
+- Introduced `display_output` method that uses `use_pager` from `MessageList`
+  to handle large outputs gracefully
+- Modified `FollowChat#process_response` to conditionally call
+  `display_formatted_terminal_output` based on `@chat.stream.on?`
+- Added `use_pager` method to `MessageList` that wraps output blocks with pager
+  context using `Kramdown::ANSI::Pager`
+- Updated conditional logic in `follow_chat.rb` to properly distinguish between
+  streaming and non-streaming display modes
+- Updated `kramdown-ansi` dependency version from `~> 0.2` to `~> 0.3` in
+  `Rakefile` and `ollama_chat.gemspec`
+- Added `truncate_for_terminal` method to `OllamaChat::FollowChat` class that
+  limits text to a specified number of lines
+- Modified `display_formatted_terminal_output` to use `truncate_for_terminal`
+  when processing content and thinking text
+- Updated spec file to expose the `FollowChat` instance for testing
+- Added comprehensive tests for the new `truncate_for_terminal` method covering
+  various line count scenarios
+- The method handles edge cases like negative and zero line counts by returning
+  the last line
+- Uses `Tins::Terminal.lines` as default maximum lines parameter
+- The implementation ensures terminal output stays within display limits while
+  preserving content integrity
+
+## 2025-12-09 v0.0.43
+
+- Added retry logic in `interact_with_user` method to handle
+  `Ollama::Errors::BadRequestError` when in think mode
+- Introduced `think_loud` switch with associated UI commands and logic in
+  `chat.rb`
+- Implemented `OllamaChat::ThinkControl` module in
+  `lib/ollama_chat/think_control.rb` with methods `think`, `choose_think_mode`,
+  `think?`, and `think_show`
+- Updated `ollama-ruby` dependency from version **1.14** to **1.16**
+- Simplified think mode handling and updated related tests
+- Added string modes support for think feature allowing values `"low"`,
+  `"medium"`, `"high"`
+- Modified `FollowChat` to conditionally append thinking annotations based on
+  `think_loud.on?`
+- Updated documentation comments to follow new tagging conventions for method
+  returns and attribute accessors
+- Updated `default_config.yml` to set `think_loud: true` by default
+- Modified information display to include `think_loud.show`
+- Adjusted tests to mock `think_loud` and verify annotation handling
+- Updated `follow_chat_spec.rb` to stub `think_loud?` instead of
+  `think_loud.on?`
+
 ## 2025-12-03 v0.0.42
 
 - Updated `ollama-ruby` gem dependency from version **1.7** to **1.14**

data/README.md

@@ -170,7 +170,8 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /info                           show information for current session
 /config                         output current configuration ("/Users/flori/.config/ollama_chat/config.yml")
 /document_policy                pick a scan policy for document references
-/think                          enable ollama think setting for models
+/think                          choose ollama think mode setting for models
+/think_loud                     enable to think out loud instead of silently
 /import source                  import the source's content
 /summarize [n] source           summarize the source's content in n words
 /embedding                      toggle embedding paused or not

data/Rakefile

@@ -37,7 +37,7 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.14'
+  dependency             'ollama-ruby',           '~> 1.16'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
   dependency             'unix_socks',            '~> 0.1'
   dependency             'rss',                   '~> 0.3'
@@ -45,7 +45,7 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'kramdown-ansi',         '~> 0.2'
+  dependency             'kramdown-ansi',         '~> 0.3'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.47'
   dependency             'search_ui',             '~> 0.0'

data/lib/ollama_chat/chat.rb

@@ -40,6 +40,7 @@ class OllamaChat::Chat
   include OllamaChat::SourceFetching
   include OllamaChat::WebSearching
   include OllamaChat::Dialog
+  include OllamaChat::ThinkControl
   include OllamaChat::Information
   include OllamaChat::MessageOutput
   include OllamaChat::Clipboard
@@ -80,6 +81,7 @@ class OllamaChat::Chat
     @opts               = go 'f:u:m:s:c:C:D:MESVh', argv
     @opts[?h] and exit usage
     @opts[?V] and exit version
+    @messages           = OllamaChat::MessageList.new(self)
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
     self.config         = @ollama_chat_config.config
     setup_switches(config)
@@ -98,9 +100,9 @@ class OllamaChat::Chat
     @document_policy = config.document_policy
     @model           = choose_model(@opts[?m], config.model.name)
     @model_options   = Ollama::Options[config.model.options]
+    @think           = config.think
     model_system     = pull_model_unless_present(@model, @model_options)
     embedding_enabled.set(config.embedding.enabled && !@opts[?E])
-    @messages        = OllamaChat::MessageList.new(self)
     if @opts[?c]
       messages.load_conversation(@opts[?c])
     else
@@ -305,7 +307,10 @@ class OllamaChat::Chat
       choose_document_policy
       :next
     when %r(^/think$)
-      think.toggle
+      choose_think_mode
+      :next
+    when %r(^/think_loud$)
+      think_loud.toggle
       :next
     when %r(^/import\s+(.+))
       @parse_content = false
@@ -601,14 +606,27 @@ class OllamaChat::Chat
         messages:,
         voice:    (@current_voice if voice.on?)
       )
-      ollama.chat(
-        model:    @model,
-        messages: ,
-        options:  @model_options,
-        stream:   stream.on?,
-        think:    think.on?,
-        &handler
-      )
+      begin
+        retried = false
+        ollama.chat(
+          model:    @model,
+          messages: ,
+          options:  @model_options,
+          stream:   stream.on?,
+          think:    ,
+          &handler
+        )
+      rescue Ollama::Errors::BadRequestError
+        if think? && !retried
+          STDOUT.puts "#{bold('Error')}: in think mode, switch thinking off and retry."
+          sleep 1
+          @think  = false
+          retried = true
+          retry
+        else
+          raise
+        end
+      end
       if embedding.on? && !records.empty?
         STDOUT.puts "", records.map { |record|
           link = if record.source =~ %r(\Ahttps?://)
@@ -686,8 +704,6 @@ class OllamaChat::Chat
   #
   # @param document_list [Array<String>] List of document paths or URLs to process
   #
-  # @return [void]
-  #
   # @example Adding local files
   #   add_documents_from_argv(['/path/to/file1.txt', '/path/to/file2.pdf'])
   #

data/lib/ollama_chat/follow_chat.rb

@@ -68,7 +68,13 @@ class OllamaChat::FollowChat
     if response&.message&.role == 'assistant'
       ensure_assistant_response_exists
       update_last_message(response)
-      display_formatted_terminal_output
+      if @chat.stream.on?
+        display_formatted_terminal_output
+      else
+        if display_output
+          display_formatted_terminal_output
+        end
+      end
       @say.call(response)
     end
 
@@ -79,6 +85,25 @@ class OllamaChat::FollowChat
 
   private
 
+  # The truncate_for_terminal method processes text to fit within a specified
+  # number of lines.
+  #
+  # This method takes a text string and trims it to ensure it doesn't exceed
+  # the maximum number of lines allowed for terminal display. If the text
+  # exceeds the limit, only
+  # the last N lines are retained where N equals the maximum lines parameter.
+  #
+  # @param text [ String ] the text content to be processed
+  # @param max_lines [ Integer ] the maximum number of lines allowed (defaults to terminal lines)
+  #
+  # @return [ String ] the text truncated to fit within the specified line limit
+  def truncate_for_terminal(text, max_lines: Tins::Terminal.lines)
+    max_lines = max_lines.clamp(1..)
+    lines = text.lines
+    return text if lines.size <= max_lines
+    lines[-max_lines..-1].join('')
+  end
+
   # The ensure_assistant_response_exists method ensures that the last message
   # in the conversation is from the assistant role.
   #
@@ -91,7 +116,7 @@ class OllamaChat::FollowChat
       @messages << Message.new(
         role: 'assistant',
         content: '',
-        thinking: ('' if @chat.think.on?)
+        thinking: ('' if @chat.think?)
       )
       @user = message_type(@messages.last.images) + " " +
         bold { color(111) { 'assistant:' } }
@@ -106,11 +131,51 @@ class OllamaChat::FollowChat
   # and thinking
   def update_last_message(response)
     @messages.last.content << response.message&.content
-    if @chat.think.on? and response_thinking = response.message&.thinking.full?
+    if @chat.think_loud? and response_thinking = response.message&.thinking.full?
       @messages.last.thinking << response_thinking
     end
   end
 
+  # The prepare_last_message method processes and formats content and thinking
+  # annotations for display.
+  #
+  # This method prepares the final content and thinking text by applying
+  # appropriate formatting based on the chat's markdown and think loud
+  # settings. It handles parsing of content through Kramdown::ANSI when
+  # markdown is enabled, and applies annotation
+  # formatting to both content and thinking text according to the chat's
+  # configuration.
+  #
+  # @return [Array<String, String>] an array containing the processed content
+  #   and thinking text
+  # @return [Array<String, nil>] an array containing the processed content and
+  #   nil if thinking is disabled
+  def prepare_last_message
+    content, thinking = @messages.last.content, @messages.last.thinking
+    if @chat.markdown.on?
+      content = talk_annotate { truncate_for_terminal @chat.kramdown_ansi_parse(content) }
+      if @chat.think_loud?
+        thinking = think_annotate { truncate_for_terminal@chat.kramdown_ansi_parse(thinking) }
+      end
+    else
+      content = talk_annotate { content }
+      @chat.think? and thinking = think_annotate { thinking }
+    end
+    return content, thinking
+  end
+
+  # The last_message_with_user method constructs a formatted message array by
+  # combining user information, newline characters, thinking annotations, and
+  # content for display in the terminal output.
+  #
+  # @return [ Array ] an array containing the user identifier, newline
+  #   character, thinking annotation (if present), and content formatted for
+  #   terminal display
+  def last_message_with_user
+    content, thinking = prepare_last_message
+    [ @user, ?\n, thinking, content ]
+  end
+
   # The display_formatted_terminal_output method formats and outputs the
   # terminal content by processing the last message's content and thinking,
   # then prints it to the output. It handles markdown parsing and annotation
@@ -119,19 +184,21 @@ class OllamaChat::FollowChat
   # thinking modes are enabled to determine how to process and display the
   # content.
   def display_formatted_terminal_output
-    content, thinking = @messages.last.content, @messages.last.thinking
-    if @chat.markdown.on?
-      content = talk_annotate { @chat.kramdown_ansi_parse(content) }
-      if @chat.think.on?
-        thinking = think_annotate { @chat.kramdown_ansi_parse(content) }
-      end
-    else
-      content = talk_annotate { content }
-      @chat.think.on? and thinking = think_annotate { @messages.last.thinking.full? }
+    @output.print(*([ clear_screen, move_home, *last_message_with_user ].compact))
+  end
+
+  # The display_output method shows the last message in the conversation.
+  #
+  # This method delegates to the messages object's show_last method, which
+  # displays the most recent non-user message in the conversation history.
+  # It is typically used to provide feedback to the user about the last
+  # response from the assistant.
+  # @return [ nil, String ] the pager command or nil if no paging was
+  #   performed.
+  def display_output
+    @messages.use_pager do |output|
+      output.print(*last_message_with_user)
     end
-    @output.print(*([
-      clear_screen, move_home, @user, ?\n, thinking, content
-    ].compact))
   end
 
   # The eval_stats method processes response statistics and formats them into a

data/lib/ollama_chat/information.rb

@@ -99,7 +99,8 @@ module OllamaChat::Information
     end
     markdown.show
     stream.show
-    think.show
+    think_show
+    think_loud.show
     location.show
     voice.show
     if @voice.on?
@@ -136,7 +137,8 @@ module OllamaChat::Information
       /info                           show information for current session
       /config                         output current configuration (#{@ollama_chat_config.filename.to_s.inspect})
       /document_policy                pick a scan policy for document references
-      /think                          enable ollama think setting for models
+      /think                          choose ollama think mode setting for models
+      /think_loud                     enable to think out loud instead of silently
       /import source                  import the source's content
       /summarize [n] source           summarize the source's content in n words
       /embedding                      toggle embedding paused or not

data/lib/ollama_chat/message_format.rb

@@ -34,7 +34,7 @@ module OllamaChat::MessageFormat
   def think_annotate(&block)
     string = block.()
     string.to_s.size == 0 and return
-    if @chat.think.on?
+    if @chat.think?
       "💭\n#{string}\n"
     end
   end
@@ -48,7 +48,7 @@ module OllamaChat::MessageFormat
   def talk_annotate(&block)
     string = block.()
     string.to_s.size == 0 and return
-    if @chat.think.on?
+    if @chat.think?
       "💬\n#{string}\n"
     else
       string

data/lib/ollama_chat/message_list.rb

@@ -290,6 +290,22 @@ class OllamaChat::MessageList
     end.to_s
   end
 
+  # The use_pager method wraps the given block with a pager context.
+  # If the output would exceed the terminal's line capacity, it pipes the content
+  # through an appropriate pager command (like 'less' or 'more').
+  #
+  # @yield A block that yields an IO object to write output to
+  # @yieldparam [IO] the IO object to write to
+  def use_pager
+    command       = determine_pager_command
+    output_buffer = StringIO.new
+    yield output_buffer
+    messages = output_buffer.string
+    Kramdown::ANSI::Pager.pager(command:, lines: messages.count(?\n)) do |output|
+      output.puts messages
+    end
+  end
+
   private
 
   # The config method provides access to the chat configuration object.
@@ -311,22 +327,6 @@ class OllamaChat::MessageList
     OllamaChat::EnvConfig::PAGER?
   end
 
-  # The use_pager method wraps the given block with a pager context.
-  # If the output would exceed the terminal's line capacity, it pipes the content
-  # through an appropriate pager command (like 'less' or 'more').
-  #
-  # @yield A block that yields an IO object to write output to
-  # @yieldparam [IO] the IO object to write to
-  def use_pager
-    command       = determine_pager_command
-    output_buffer = StringIO.new
-    yield output_buffer
-    messages = output_buffer.string
-    Kramdown::ANSI::Pager.pager(command:, lines: messages.count(?\n)) do |output|
-      output.puts messages
-    end
-  end
-
   # The message_text_for method generates formatted text representation of a
   # message including its role, content, thinking annotations, and associated
   # images.
@@ -344,7 +344,7 @@ class OllamaChat::MessageList
                  when 'system' then 213
                  else 210
                  end
-    thinking = if @chat.think.on?
+    thinking = if @chat.think?
                  think_annotate do
                    message.thinking.full? { @chat.markdown.on? ? @chat.kramdown_ansi_parse(_1) : _1 }
                  end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -42,6 +42,7 @@ markdown: true
 stream: true
 document_policy: importing
 think: false
+think_loud: true
 embedding:
   enabled: true
   paused: false

data/lib/ollama_chat/switches.rb

@@ -40,8 +40,6 @@ module OllamaChat::Switches
 
     # The show method outputs the current value of the message to standard
     # output.
-    #
-    # @return [ void ]
     def show
       STDOUT.puts @msg[value]
     end
@@ -137,17 +135,17 @@ module OllamaChat::Switches
   # @return [ OllamaChat::Switches::Switch ] the stream switch instance
   attr_reader :stream
 
-  # The think method returns the current state of the thinking switch.
-  #
-  # @return [ OllamaChat::Switches::Switch ] the thinking switch instance
-  attr_reader :think
-
   # The markdown attribute reader returns the markdown switch object.
   # The voice reader returns the voice switch instance.
   #
   # @return [ OllamaChat::Switches::Switch ] the markdown switch instance
   attr_reader :markdown
 
+  # The think_loud method returns the current state of the think loud switch.
+  #
+  # @return [ OllamaChat::Switches::Switch ] the think loud switch instance
+  attr_reader :think_loud
+
   # The voice reader returns the voice switch instance.
   #
   # @return [ OllamaChat::Switches::Switch ] the voice switch instance
@@ -193,11 +191,11 @@ module OllamaChat::Switches
       }
     )
 
-    @think = Switch.new(
-      value: config.think,
+    @think_loud = Switch.new(
+      value: config.think_loud,
       msg: {
-        true  => "Thinking enabled.",
-        false => "Thinking disabled.",
+        true  => "Thinking out loud, show thinking annotations.",
+        false => "Thinking silently, don't show thinking annotations.",
       }
     )
 

data/lib/ollama_chat/think_control.rb

@@ -0,0 +1,64 @@
+# A module that provides thinking control functionality for OllamaChat.
+#
+# The ThinkControl module encapsulates methods for managing the 'think' mode
+# setting in OllamaChat sessions. It handles the selection of different
+# thinking modes, checking the current state, and displaying the current
+# think mode status.
+module OllamaChat::ThinkControl
+  # The think method returns the current state of the think mode.
+  #
+  # @return [ true, false, String ] the think mode
+  attr_reader :think
+
+  # The choose_think_mode method presents a menu to select a think mode.
+  #
+  # This method displays available think modes to the user and sets the
+  # selected mode as the current think mode for the chat session.
+  def choose_think_mode
+    think_modes = %w[ off on low medium high [EXIT] ]
+    case chosen = OllamaChat::Utils::Chooser.choose(think_modes)
+    when '[EXIT]', nil
+      STDOUT.puts "Exiting chooser."
+    when 'off'
+      @think = false
+    when 'on'
+      @think = true
+    when 'low', 'medium', 'high'
+      @think = chosen
+    end
+  end
+
+  # The think? method checks if the think mode is enabled.
+  #
+  # @return [ TrueClass, FalseClass ] true if think mode is enabled, false
+  #   otherwise
+  def think?
+    !!think
+  end
+
+  # The think_mode method returns the current think mode status as a string.
+  #
+  # @return [ String ] returns 'enabled' if think mode is true, the think mode
+  #   value if it's a string, or 'disabled' if think mode is false or nil
+  def think_mode
+    think == true ? 'enabled' : think || 'disabled'
+  end
+
+  # The think_show method displays the current think mode status.
+  #
+  # This method checks the current think mode setting and outputs a message
+  # indicating whether think mode is enabled, disabled, or set to a specific
+  # mode level (low, medium, high).
+  def think_show
+    STDOUT.puts "Think mode is #{bold(think_mode)}."
+  end
+
+  # The think_loud? method checks if both think mode and think loud mode are
+  # enabled.
+  #
+  # @return [ TrueClass, FalseClass ] true if think mode is enabled and think
+  #   loud mode is on, false otherwise
+  def think_loud?
+    think? && think_loud.on?
+  end
+end

data/lib/ollama_chat/utils/cache_fetcher.rb

@@ -19,8 +19,6 @@ class OllamaChat::Utils::CacheFetcher
   # The initialize method sets up the cache instance variable for the object.
   #
   # @param cache [ Object ] the cache object to be stored
-  #
-  # @return [ void ]
   def initialize(cache)
     @cache = cache
   end

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat.rb

@@ -25,6 +25,7 @@ require 'ollama_chat/parsing'
 require 'ollama_chat/source_fetching'
 require 'ollama_chat/web_searching'
 require 'ollama_chat/dialog'
+require 'ollama_chat/think_control'
 require 'ollama_chat/information'
 require 'ollama_chat/message_output'
 require 'ollama_chat/clipboard'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.42 ruby lib
+# stub: ollama_chat 0.0.44 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.42".freeze
+  s.version = "0.0.44".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   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/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 = [".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/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/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/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.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/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/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/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/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/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]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   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.14".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.16".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.1".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
-  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.2".freeze])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.47".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])

data/spec/ollama_chat/chat_spec.rb

@@ -312,7 +312,8 @@ describe OllamaChat::Chat, protect_env: true do
             Streaming|
             Location|
             Document\ policy|
-            Thinking|
+            Think\ mode|
+            Thinking\ out\ loud|
             Voice\ output|
             Currently\ selected\ search\ engine|
             Conversation\ length

data/spec/ollama_chat/follow_chat_spec.rb

@@ -8,11 +8,12 @@ describe OllamaChat::FollowChat do
   end
 
   let :chat do
-    double('Chat', markdown: double(on?: false), think: double(on?: false), debug: false)
+    double('Chat', markdown: double(on?: false), think_loud?: true,
+           think?: false, debug: false, stream: double(on?: true))
   end
 
   let :follow_chat do
-    described_class.new(chat:, messages:, output:)
+    described_class.new(chat:, messages:, output:).expose
   end
 
   let :output do
@@ -45,4 +46,33 @@ describe OllamaChat::FollowChat do
     expect(output).to receive(:puts).with("", /eval_duration/)
     follow_chat.call(response)
   end
+
+  context '#truncate_for_terminal' do
+    it 'can truncate text for 5 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 5)).to eq(
+        (?V..?Z).to_a.join(?\n)
+      )
+    end
+
+    it 'can truncate text for -1 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: -1)).to eq(?Z)
+    end
+
+    it 'can truncate text for 0 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 0)).to eq(?Z)
+    end
+
+    it 'can truncate text for 1 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 1)).to eq(?Z)
+    end
+
+    it 'can truncate text for 42 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 42)).to eq(text)
+    end
+  end
 end

data/spec/ollama_chat/message_list_spec.rb

@@ -103,7 +103,7 @@ describe OllamaChat::MessageList do
 
     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(:think?).and_return(false)
       allow(chat).to receive(:markdown).and_return(double(on?: false))
       list << Ollama::Message.new(role: 'assistant', content: 'hello')
       expect(STDOUT).to receive(:puts).
@@ -119,7 +119,7 @@ describe OllamaChat::MessageList do
     end
 
     it "shows last N messages when N is larger than available messages" do
-      allow(chat).to receive(:think).and_return(double(on?: false))
+      allow(chat).to receive(:think?).and_return(false)
       allow(chat).to receive(:markdown).and_return(double(on?: false))
       list = described_class.new(chat)
       list << Ollama::Message.new(role: 'system', content: 'hello')
@@ -139,8 +139,7 @@ describe OllamaChat::MessageList do
     it 'can show last message' do
       expect(chat).to receive(:markdown).
         and_return(double(on?: true)).at_least(:once)
-      expect(chat).to receive(:think).
-        and_return(double(on?: false)).at_least(:once)
+      expect(chat).to receive(:think?).and_return(false).at_least(:once)
       expect(STDOUT).to receive(:puts).
         with("📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\nhello\n")
       list.show_last
@@ -149,8 +148,7 @@ describe OllamaChat::MessageList do
     it 'can list conversations without thinking' do
       expect(chat).to receive(:markdown).
         and_return(double(on?: true)).at_least(:once)
-      expect(chat).to receive(:think).
-        and_return(double(on?: false)).at_least(:once)
+      expect(chat).to receive(:think?).and_return(false).at_least(:once)
       list << Ollama::Message.new(role: 'user', content: 'world')
       expect(STDOUT).to receive(:puts).
         with(
@@ -163,8 +161,7 @@ describe OllamaChat::MessageList do
     it 'can list conversations with thinking' do
       expect(chat).to receive(:markdown).
         and_return(double(on?: true)).at_least(:once)
-      expect(chat).to receive(:think).
-        and_return(double(on?: true)).at_least(:once)
+      expect(chat).to receive(:think?).and_return(true).at_least(:once)
       expect(STDOUT).to receive(:puts).
         with(
           "📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\n" \
@@ -190,8 +187,7 @@ describe OllamaChat::MessageList do
     it 'can list conversations' do
       expect(chat).to receive(:markdown).
         and_return(double(on?: true)).at_least(:once)
-      expect(chat).to receive(:think).
-        and_return(double(on?: false)).at_least(:once)
+      expect(chat).to receive(:think?).and_return(false).at_least(:once)
       list << Ollama::Message.new(role: 'user', content: 'world')
       list.list_conversation
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.44
 platform: ruby
 authors:
 - Florian Frank
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -259,14 +259,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +406,7 @@ extra_rdoc_files:
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
+- lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
 - lib/ollama_chat/utils/cache_fetcher.rb
 - lib/ollama_chat/utils/chooser.rb
@@ -445,6 +446,7 @@ files:
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
+- lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
 - lib/ollama_chat/utils/cache_fetcher.rb
 - lib/ollama_chat/utils/chooser.rb