ollama_chat 0.0.113 → 0.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e618b797bf1b5fa84728816e06b83fe3540424b48256ba107deb29c2beb8a219
-  data.tar.gz: f5abee2701f3fc6d7ba09513f0b0bd5133c7ec10ddb511ee5ea4238c14f9988e
+  metadata.gz: 18297e3bbf39619c1721b30fdf4f691a2a71b1e15994c2ae28ced14eb7f76c57
+  data.tar.gz: 1481131a053ef2d9390456c84e9d58bf0890d1ded23eafb5d15c4b1b70babb99
 SHA512:
-  metadata.gz: 2f2172cc90da0a8b8c1b7f2306abbc8480db92abeb3629e20b2471e88fdd79ca2d18c209c05690167b564b6911685222dce48496e9825330e43500ff520aab74
-  data.tar.gz: da6e5e8583b11cb7d766ff0745e97070f2a39ac8f1ca6314a4bcb93d8e9a6c3ec9ef087a055b7c9844317f831fc4a6a590e11f80eaf6b6c80980143ab8385771
+  metadata.gz: 6ec5d58d329bb3b8a25ccdb0ce55cb04be29f5e8b22e2b3f7aa8ce77bfe49cf56d33c6c198c63431b4ccca9e78029887fe221be1effa5306d4aef464fe530fd9
+  data.tar.gz: ec410eb4d78a5688cb4b67bec44a3600a8e295578bb9375142957577b92d03c5ae0ada7f0e4f7841b70ed40c9dea8e6f1acc688d76abc6ba4d156c550cbf3324

data/CHANGES.md

@@ -1,5 +1,125 @@
 # Changes
 
+## 2026-09-01 v0.0.115
+
+*   Added `OllamaChat::Tools::ExecuteShell` in
+    `lib/ollama_chat/tools/execute_shell.rb`, which executes shell commands via
+    `sh -c` after a mandatory human review flow involving an `edit_text` editor
+    review and a `y/n/i` confirm prompt.
+*   Implemented a `y/n/i` gate in the `execute_shell` tool where `y` executes,
+    `n` cancels, and `i` captures user instructions for the LLM to revise the
+    command.
+*   Configured `require_confirmation: false` in `default_config.yml` to skip
+    the preflight confirm in `follow_chat`, relying on the in-tool `confirm?`
+    as the primary safety mechanism.
+*   Enabled output display via `use_pager` with bold `stdout:`/`stderr:` labels
+    and exit codes, with `monochrome: true` (default) stripping ANSI codes
+    before returning results to the LLM.
+*   Standardized error handling for `execute_shell` failure paths (blank
+    command, editor abandoned/cleared, user declined, instruct) to raise
+    `OllamaChat::ToolFunctionArgumentError`, which is rescued to log and return
+    structured JSON including the `command`.
+*   Added a `summary_template` class method to `execute_shell` for one-liner
+    output in `lookup_group` compaction.
+*   Registered `execute_shell` in `lib/ollama_chat/tools.rb` and configured it
+    in `default_config.yml` with `default: false` and `result_display_timeout:
+    10`.
+*   Added 18 spec examples in `spec/ollama_chat/tools/execute_shell_spec.rb`
+    covering identity, execution, editor cancel, instruct, monochrome, pager
+    display, and `summary_template`.
+*   Introduced `OllamaChat::Utils::StripANSI` module in
+    `lib/ollama_chat/utils/strip_ansi.rb` with a regex-based `strip_ansi`
+    method handling both SGR and OSC escape sequences.
+*   Replaced `Term::ANSIColor.uncolor` calls with `strip_ansi` in
+    `lib/ollama_chat/tools/execute_shell.rb`, `lib/ollama_chat/commands.rb`
+    (`/input` path and default subcommands), and `bin/ollama_chat_send`.
+*   Registered `lib/ollama_chat/utils/strip_ansi.rb` in `ollama_chat.gemspec`
+    file lists.
+*   Fixed `read_file` and `write_file` spec assertions in `read_file_spec.rb`
+    and `write_file_spec.rb` to match the token-first output format (`tokens
+    (bytes)`) shipped in **v0.0.114**.
+
+## 2026-09-01 v0.0.114
+
+### Added
+
+* Context compaction pipeline:
+  * `OllamaChat::Compaction` module with `summarize_for_compaction`,
+    `compact_with_retry`, `compact_ratio_tokens`, `tool_summary_line`, and
+    `Result` value object.
+  * `CompactionError` exception.
+  * `MessageList` methods: `compact!`, `find_cut_point`, `find_summary`,
+    `compacted_messages`, `compacted_estimate_tokens`, and
+    `full_estimate_tokens`.
+  * `lookup_group` tool for retrieving pre-summary group content by UUID
+    suffix.
+  * `summary_template` base method in `Tools::Concern` and `message` field in
+    `eval_ruby` and `get_rfc` results.
+  * `compaction:` configuration block (`enabled`, `reserve`, `keep_recent`) and
+    `prompts.compaction` templates in `default_config.yml`.
+  * `conversation_length` in `Information` and dynamic runtime values.
+* Per-message token estimation:
+  * `#token_estimate(strip_thinking:)` in `OllamaChat::MessageMixin`.
+  * `#total_tokens(strip_thinking:)` in `OllamaChat::MessageList`.
+* Color-coded context gauge:
+  * `context_gauge` method in `information.rb` displaying context usage with
+    ANSI colors and emoji indicators.
+* Configurable syntax checkers for file tools:
+  * `syntax_checkers:` block in `default_config.yml` for `ruby`, `javascript`,
+    `python`, and `shell`.
+  * `ConfigHandling#syntax_checker_for` and `ConfigHandling#run_syntax_check`
+    methods.
+  * Integration into `Tools::WriteFile#execute` and `Tools::PatchFile#execute`.
+* Log rotation and restructured log configuration:
+  * `LOG` module (`CHAT`, `DATABASE`, `TAIL_LINES`) in `oc.rb`.
+  * `OllamaChat::Utils::LogRotation.truncate_tail` for in-place log truncation.
+  * `truncate_logs` call in `OllamaChat::Chat#initialize`.
+  * Database `Logger` level set to `WARN`.
+* Enabled flag for RAG collections:
+  * Migration adding `enabled` boolean to `collections` table.
+  * Filtering of disabled collections in `information.rb` and
+    `search_knowledge`.
+  * Interactive toggle in `edit_collection` and `[DISABLED]` suffix in
+    `list_collections`.
+* Monochrome flags:
+  * `-m` flag for `bin/ollama_chat_send` to strip ANSI codes from stdin.
+  * `-m` flag for `/input` command to strip ANSI codes from file content and
+    import results.
+* Session synchronization:
+  * `session_sync` method extracted from `session_close` in
+    `session_management.rb`.
+  * `ensure session.lock` in `set_new_session`.
+
+### Changed
+
+* Increased `compaction.reserve.ratio` from **0.30** to **0.60** in
+  `default_config.yml`.
+* Switched `Struct.new` to `Data.define` in `ModelMetadata`, `Estimate`, and
+  `TagResult`.
+* Standardized user-facing output format to `tokens (bytes)` across
+  `read_file`, `write_file`, `session_management`, and `information`.
+* Replaced `.size` with `.bytesize` for multi-byte-safe byte counts in
+  `token_estimator/crude.rb`, `fetcher.rb`, `paste_from_clipboard.rb`, and
+  `prompt_handling.rb`.
+* Updated `/conversation compact` to delegate to `compact_with_retry`.
+* Threaded `chat` into `TagResolver` for logging, fixing `NoMethodError` in
+  rescue blocks.
+* Capped inline directory structure depth:
+  * Added `parsing.directory_structure_max_depth` (default **1**) to
+    `default_config.yml`.
+  * Shifted `max_depth` semantics: **1** = immediate children, **2** = children
+    + grandchildren, `nil` = unlimited.
+* Acknowledged prompt state after `/prompt sync` to suppress boot drift nag.
+* Reordered `session_title` prompt for reliability.
+* `/config diff` now calls `reload_config` after `diff_config`.
+* Reordered `/config` subcommand alternatives to `edit diff reload`.
+* Clarified `suffix` description in `directory_structure` as "file extension".
+
+### Fixed
+
+* `NoMethodError` in `TagResolver#resolve` rescue block.
+* Unbounded tree expansion in directory structure parsing.
+
 ## 2026-08-25 v0.0.113
 
 *   Simplified hash syntax by replacing `text: text` with `text:` etc.

data/README.md

@@ -37,6 +37,9 @@ The following environment variables can be used to configure behavior:
 - `OLLAMA_CHAT_HISTORY` - Chat history filename
 - `OLLAMA_CHAT_USER` - Full name of the chat user
 - `OLLAMA_CHAT_DEBUG` - Debug mode toggle (1 = enabled)
+- `OLLAMA_CHAT_LOG_CHAT` - Chat log file path (default: `$XDG_STATE_HOME/chat.log`)
+- `OLLAMA_CHAT_LOG_DATABASE` - Database log file path (default: `$XDG_STATE_HOME/database.log`)
+- `OLLAMA_CHAT_LOG_TAIL_LINES` - Max lines to retain in log files (default: `10000`)
 
 #### Tool Configuration
 - `OLLAMA_CHAT_TOOLS_TEST_RUNNER` - Configured test runner for `run_tests` (default: `rspec`)
@@ -45,11 +48,14 @@ The following environment variables can be used to configure behavior:
 - `OLLAMA_CHAT_TOOLS_JIRA_URL` - Base URL for Jira instance
 - `OLLAMA_CHAT_TOOLS_JIRA_USER` - Username for Jira authentication
 - `OLLAMA_CHAT_TOOLS_JIRA_API_TOKEN` - API token for Jira authentication
+- `OLLAMA_CHAT_TOOLS_JIRA_TWG` - Path to the twg CLI binary
 - `OLLAMA_CHAT_TOOLS_IMAGE_GENERATOR_URL` - Base URL for ComfyUI server
 - `OLLAMA_CHAT_TOOLS_IMAGE_GENERATOR_WORKFLOW` - ComfyUI workflow as JSON string
 - `OLLAMA_CHAT_TOOLS_IMAGE_GENERATOR_PROMPT_NODE_ID` - Prompt node ID
 - `OLLAMA_CHAT_TOOLS_IMAGE_GENERATOR_FILENAME_PREFIX_NODE_ID` - Filename prefix node ID
 - `OLLAMA_CHAT_TOOLS_PIRATEWEATHER_API_KEY` - Pirate Weather API key
+- `OLLAMA_CHAT_TOOLS_GHR_URL` - Base URL for GHR API server
+- `OLLAMA_CHAT_TOOLS_RUBY_EVAL_IMAGE_TEMPLATE` - Docker image template for `eval_ruby` (default: `ruby:%{version}-alpine`)
 
 #### System & Infrastructure
 - `XDG_CONFIG_HOME` - XDG Configuration home directory
@@ -59,6 +65,7 @@ The following environment variables can be used to configure behavior:
 - `EDITOR` - Default text editor
 - `BROWSER` - Default web browser
 - `DIFF_TOOL` - Tool for diff operations (default: `vimdiff`)
+- `DIFF_COMMAND` - Command to generate unified diffs (default: `diff -u --color=always`)
 - `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES` - Custom ANSI styles for Markdown formatting
 - `KRAMDOWN_ANSI_STYLES` - Fallback ANSI styles configuration
 - `OLLAMA_REDIS_URL` - Redis connection URL for documents (documentrix)

data/bin/ollama_chat_log

@@ -5,7 +5,7 @@ require 'file/tail'
 require 'tins/xt'
 
 opts     = Tins::GO.go 'fm:n:h:', defaults: { ?n => 10  }
-log_path = ARGV.shift || OC::OLLAMA::CHAT::LOGFILE
+log_path = ARGV.shift || OC::OLLAMA::CHAT::LOG::CHAT
 
 if opts[?h]
   puts <<~EOT

data/bin/ollama_chat_send

@@ -5,7 +5,7 @@ include OllamaChat::FileEditing
 require 'tins/go'
 include Tins::GO
 
-opts = go 'f:d:F:rteph', ARGV
+opts = go 'f:d:F:rtemph', ARGV
 
 # Displays the usage information for the ollama_chat_send command.
 #
@@ -25,6 +25,7 @@ def usage(rc = 0)
       -f CONFIG  file to read
       -d DIR     the working directory to derive the socket file from
       -e         Edit content in editor before sending
+      -m         Strip ANSI color codes from content before sending
       -F FORMAT  file extension for editor (e.g., rb, md)
       -h         Show this help message
 
@@ -42,6 +43,7 @@ begin
            opts[?r] ? :socket_input_with_response : :socket_input
          end
   content = STDIN.read
+  content = OllamaChat::Utils::StripANSI.strip_ansi(content) if opts[?m]
   if opts[?e]
     basename = %w[ text ]
     basename << opts[?F]&.sub(/\A(?=[^.])/, ?.) || '.md'

data/lib/ollama_chat/chat.rb

@@ -69,6 +69,7 @@ class OllamaChat::Chat
   include OllamaChat::PromptHandling
   include OllamaChat::SystemPromptManagement
   include OllamaChat::PromptManagement
+  include OllamaChat::Compaction
   include OllamaChat::Utils::Chooser
   include OllamaChat::Utils::ValueFormatter
   include OllamaChat::Utils::UTF8Converter
@@ -106,10 +107,11 @@ class OllamaChat::Chat
     @opts[?V] and exit version
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
     self.config         = @ollama_chat_config.config
+    truncate_logs
     @messages           = OllamaChat::MessageList.new(self)
     OllamaChat::Database.setup_models.each { _1.ask_and_send(:seed, self) }
-    setup_session
     setup_switches
+    setup_session
     setup_state_selectors(config)
     connect_ollama
     @documents = setup_documents
@@ -254,12 +256,14 @@ class OllamaChat::Chat
   # and a user message, executing it as a one-shot chat interaction.
   #
   # @param system [String] the system prompt to guide the model's behavior
-  # (defaults to current raw_system_prompt)
-  #
+  #   (defaults to current raw_system_prompt)
   # @param prompt [String] the user prompt to send to the model
+  # @param stream [Boolean] whether to stream the response (default: false)
+  # @param think [Boolean] enable thinking mode for hybrid-thinking models
+  #   (default: false)
   #
   # @return [String] the content of the resulting response message
-  def generate(system: raw_system_prompt, prompt:)
+  def generate(system: raw_system_prompt, prompt:, stream: false, think: false)
     messages = [
       OllamaChat::Message.new(
         role:        'system',
@@ -276,9 +280,8 @@ class OllamaChat::Chat
       model:    @model,
       messages: ,
       options:  model_options,
-      stream:   false,
-      think:    false,
-      tools:
+      stream:   ,
+      think:
     )&.message&.content.to_s
 
     if content.empty?
@@ -315,6 +318,18 @@ class OllamaChat::Chat
     ollama.chat(**opts, &block)
   end
 
+  # Truncates chat.log and database.log to the configured tail line count
+  # before any new logging begins for this session.
+  def truncate_logs
+    keep = OC::OLLAMA::CHAT::LOG::TAIL_LINES
+    OllamaChat::Utils::LogRotation.truncate_tail(
+      OC::OLLAMA::CHAT::LOG::CHAT, keep_lines: keep
+    )
+    OllamaChat::Utils::LogRotation.truncate_tail(
+      OC::OLLAMA::CHAT::LOG::DATABASE, keep_lines: keep
+    )
+  end
+
   # @return [Module] The module containing the database models.
   def models
     OllamaChat::Database::Models
@@ -532,14 +547,15 @@ class OllamaChat::Chat
       )
       begin
         retried = false
-        sent_messages = messages.to_ary
-        if think_strip.on?
-          sent_messages = sent_messages.map {
-            _1.dup.tap { |message|
-              message.thinking = nil
-            }
+        sent_messages = messages.compacted_messages
+        sent_messages = sent_messages.map {
+          _1.dup.tap { |message|
+            message.sender_name = nil
+            message.group_uuid  = nil
+            message.tool_calls  = nil
+            message.thinking    = nil if think_strip.on?
           }
-        end
+        }
         prepare_model(@model)
         call_ollama_chat(
           model:    @model,

data/lib/ollama_chat/commands.rb

@@ -62,8 +62,8 @@ module OllamaChat::Commands
 
   command(
     name: :config,
-    regexp: %r(^/config(?:\s+(edit|reload|diff))?$),
-    complete: [ 'config', %w[ edit reload diff ] ],
+    regexp: %r(^/config(?:\s+(edit|diff|reload))?$),
+    complete: [ 'config', %w[ edit diff reload ] ],
     optional: true,
     help: <<~EOT
       \u2699\uFE0F View, edit, diff, or reload configuration
@@ -72,11 +72,11 @@ module OllamaChat::Commands
     case subcommand
     when 'edit'
       edit_config
-    when 'reload'
-      reload_config
     when 'diff'
       diff_config
       reload_config
+    when 'reload'
+      reload_config
     else
       display_config
     end
@@ -598,14 +598,15 @@ module OllamaChat::Commands
 
   command(
     name: :conversation,
-    regexp: %r(^/conversation\s+(clean|save|load)(\s+-c)?(?:\s+([^-].*\.jsonl?))?$),
-    complete: [ 'conversation', %w[ save load clean ] ],
+    regexp: %r(^/conversation\s+(clean|compact|save|load)(\s+-c)?(?:\s+([^-].*\.jsonl?))?$),
+    complete: [ 'conversation', %w[ save load clean compact ] ],
     options: '[-c] [FILENAME]',
     help: <<~EOT
       💾 Save/Load conversation state
          (-c to clean before saving)
          FILENAME ends with .json or .jsonl
          Or clean inplace (removes tool content, images, and thinking)
+         Or compact (summarize old messages, keep recent)
     EOT
   ) do |subcommand,opts,path|
     if %w[ save load ].include?(subcommand) && path.blank?
@@ -631,6 +632,16 @@ module OllamaChat::Commands
       else
         STDOUT.puts 'Cancelled.'
       end
+    when 'compact'
+      if confirm?(
+          prompt: '🔔 Compact conversation? Old messages will be summarized. (y/n) ',
+          yes: /\Ay/i
+        )
+      then
+        compact_with_retry
+      else
+        STDOUT.puts 'Cancelled.'
+      end
     end
     :next
   end
@@ -836,22 +847,23 @@ module OllamaChat::Commands
 
   command(
     name: :input,
-    regexp: %r(^/input(?:\s+(path|context|embedding|summary)(?:\s*(?=\z))?)?((?:\s+-(?:[apre]|c\s*#{OllamaChat::COLLECTION_NAME_REGEXP.source}|w\s*\d+|t\s*[-\w\.]+(?:,[-\w\.]+)*))*)(?:\s+([^-].*))?$),
+    regexp: %r(^/input(?:\s+(path|context|embedding|summary)(?:\s*(?=\z))?)?((?:\s+-(?:[aprem]|c\s*#{OllamaChat::COLLECTION_NAME_REGEXP.source}|w\s*\d+|t\s*[-\w\.]+(?:,[-\w\.]+)*))*)(?:\s+([^-].*))?$),
     optional: true,
     complete: [ 'input', %w[ path context embedding summary ] ],
     options: <<~EOT,
-      [
-        -w|-a|-p|-e|
-        -c <collection>|
-        -t <tags>
-      ]
+       [
+         -w|-a|-p|-e|-m|
+         -c <collection>|
+         -t <tags>
+       ]
       [arg…]
     EOT
     help: <<~EOT
       📥 Import content (read, summarize, embed, context)
          Subcommands: path, context, embedding, summary
-         Options: -p (pattern), -w [words], -a (all),
-                  -c [collection], -t [tags], -e (edit)
+          Options: -p (pattern), -w [words], -a (all),
+                   -c [collection], -t [tags], -e (edit),
+                   -m (monochrome, strip ANSI from file content)
     EOT
   ) do |input_mode,opts,arg|
     disable_content_parsing
@@ -907,19 +919,21 @@ module OllamaChat::Commands
         end
       end
     when 'path'
-      opts = go_command('pae', opts)
+      opts = go_command('paem', opts)
       if opts[?p]
         all = opts.fetch(?a, false)
         patterns = extract_patterns(arg)
         read = -> pathname {
           STDOUT.puts "Reading #{pathname.to_s.inspect}."
-          pathname.read
+          content = pathname.read
+          opts[?m] ? OllamaChat::Utils::StripANSI.strip_ansi(content) : content
         }
         next provide_file_set_content(patterns, all:, &read) || :next
       elsif arg
         filename = Pathname.new(arg).expand_path
         filename.file? or next :next
         content = filename.read
+        content = OllamaChat::Utils::StripANSI.strip_ansi(content) if opts[?m]
         content = edit_text(content) if opts[?e]
         content
       else
@@ -927,14 +941,18 @@ module OllamaChat::Commands
         next :next
       end
     else
-      opts = go_command('pae', opts)
+      opts = go_command('paem', opts)
       if opts[?p]
         all = opts.fetch(?a, false)
         patterns = extract_patterns(arg)
-        next provide_file_set_content(patterns, all:, skip_blank: true) { import(_1) } || :next
+        next provide_file_set_content(patterns, all:, skip_blank: true) do |src|
+          content = import(src)
+          opts[?m] ? OllamaChat::Utils::StripANSI.strip_ansi(content) : content
+        end || :next
       elsif arg
         source = arg
         content = import(source) or next :next
+        content = OllamaChat::Utils::StripANSI.strip_ansi(content) if opts[?m]
         content = edit_text(content) if opts[?e]
         content
       else