ollama_chat 0.0.114 → 0.0.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5e93e610536ac396d18e929ef76b3dcecac7d3b9d88a35b8d6ff141e7eba8e4
-  data.tar.gz: a7792a3b397ebcc0d88552f0fa1417933f44ff00c6e0fad4eb62d567b5c98bfd
+  metadata.gz: beebfc1a29093b596fe008ba59b2f377922e2f7beeeb529ebed899fc374c6e02
+  data.tar.gz: e704bce9b15101283e802a6010ee08c347cf94d8fcdc2ee785da3880debde736
 SHA512:
-  metadata.gz: 95a81969d48e98ff06623f887c33bd0acf94452639fabbf4eca30127ef4d300124f9e12d7bbb97a3d8d86263116d3c772e5d9c403d1e4f4cbdc2df241e1f719f
-  data.tar.gz: 92201492f3a4a084c845d11f7957b6af6ea8630e7f242158458cb1bad059bababb8699f0dc2f24204ddfde38bcd47e8491812e03d5f38128f179b443f858a9dc
+  metadata.gz: 7cab4e5d47d97dd215e058ab9960ad8801252a2ab950d3b30ce1e514fad30b22e87f917e3b1764592070f385fcfec748cc3b59398cadf8e3553f41e6ec48e9bb
+  data.tar.gz: 0fb71bb0ab178cb1fed41ea2b257360fd19d3d180a2fc2f497d1372874d4665c3b82676ad8c056ab80a22e21e95deebb8afee8ef5f2809a07671e6cfb53ba5d7

data/CHANGES.md

@@ -1,5 +1,111 @@
 # Changes
 
+## 2026-09-03 v0.0.116
+
+### Added
+
+* `session.roleplay_story` prompt in `default_config.yml` for narrative
+  retelling of roleplay sessions via `/conversation report`.
+* `session.coding_brief` prompt in `default_config.yml`.
+* `summarize` and `report` subcommands to `/conversation`.
+* `summarize_conversation(sentence:, save:)` and `report_conversation(name:,
+  save:)` methods in `session_management.rb` to handle filename prompts,
+  overwrite checks, and I/O.
+* `report_session(name:, &block)` method using `messages.compacted_messages` to
+  keep interpolated content bounded after compaction.
+* `Status:` line with `✅`/`⛔` indicators to `collection_stats` in
+  `information.rb`.
+* `✅`/`⛔` prefixes to `list_collections` in `rag_handling.rb` to replace
+  `[DISABLED]` text suffixes.
+* `✅`/`⛔` indicators for enabled/disabled states and `❔`/`⭕` for
+  confirmation requirements in `list_tools` in `tool_calling.rb`.
+* `ask_for_filename?(action:)` and `should_overwrite?(filename)` helpers in
+  `dialog.rb` with YARD documentation.
+* Specs for `summarize_conversation`, `report_session`, and
+  `report_conversation` in `session_management_spec.rb`.
+* Routing specs for `/conversation summarize` and `/conversation report` in
+  `commands_spec.rb`.
+* YARD documentation for `repair_group_uuids`.
+
+### Changed
+
+* Moved `summarize` subcommand from `/session` to `/conversation`.
+* Reworked compaction prompt to a draft-rewrite model, treating previous
+  summaries as drafts to be rewritten rather than ambient context.
+* Replaced "6-12 sentences" constraint in compaction prompt with "Be concise;
+  skip filler and repetition".
+* Changed `assemble: |-` to `assemble: |` in compaction prompt to preserve
+  trailing newlines.
+* Widened factuality scope in compaction prompt to include "groups or previous
+  summary above".
+* Wrapped `list_tools` body in `use_pager`, redirecting writes through the
+  yielded `output` IO.
+* Passed `output:` keyword argument to `tools_support.show(output:)`.
+* Replaced inline `File.exist?` and `confirm?` blocks in
+  `conversation.rb#save_conversation`,
+  `message_output.rb#attempt_to_write_file`, `session_management.rb`, and
+  `file_editing.rb#determine_valid_output_filename` with the shared
+  `should_overwrite?` helper.
+* Updated `chat_spec.rb` `collection_stats` regex to include the new `Status:
+  ✅` line.
+* Updated `tool_calling_spec.rb` `list_tools` regex to use `✅`/`⛔` instead of
+  `✓`/`☐`.
+* Updated `tool_calling_spec.rb` `#list_tools` example to stub `use_pager` with
+  a `StringIO` yield.
+* Updated `conversation_spec.rb` expectations for `Pathname` type and
+  `should_overwrite?` STDERR output.
+* Updated comment in `lib/ollama_chat/prompt_management.rb` to reflect new
+  naming convention for prompt templates (e.g., `suggest.coding`).
+* Rewrapped `prompts.suggest.roleplaying` few-shot examples to stay within 80
+  columns in `default_config.yml`.
+* Fixed stale YARD example in `session_management.rb#report_session`
+  (`roleplay_report` to `roleplay_story`).
+
+### Removed
+
+* `pretty:` keyword argument from `summarize_session` and
+  `summarize_conversation`; markdown formatting is now the only path.
+* `%{message_thinking}` from the `session_summarize` prompt.
+
+## 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

data/bin/ollama_chat_send

@@ -43,7 +43,7 @@ begin
            opts[?r] ? :socket_input_with_response : :socket_input
          end
   content = STDIN.read
-  content = Term::ANSIColor.uncolor(content) if opts[?m]
+  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/commands.rb

@@ -291,15 +291,14 @@ module OllamaChat::Commands
 
   command(
     name: :session,
-    regexp: %r(^/session(?:\s+(change|previous|list|new|duplicate|rename|summarize|delete|model options change|model options))?((?:\s+-(?:[sf]|p\s*\w+))*)(?:\s+([^-].*))?$),
-    complete: [ 'session', %w[ change previous list new duplicate rename summarize delete model\ options\ change model\ options ] ],
+    regexp: %r(^/session(?:\s+(change|previous|list|new|duplicate|rename|delete|model options change|model options))?((?:\s+-(?:p\s*\w+))*)(?:\s+([^-].*))?$),
+    complete: [ 'session', %w[ change previous list new duplicate rename delete model\ options\ change model\ options ] ],
     optional: true,
-    options: "[-s|-f|-p profile]\n[name]",
+    options: "[-p profile]\n[name]",
     help: <<~EOT
       💬 Manage sessions:
          - list/new/delete/rename/duplicate
          - change [name]/previous
-         - summarize (-s sentence, -f save to file)
          - model options/change
     EOT
   ) do |subcommand, opts, name|
@@ -316,44 +315,6 @@ module OllamaChat::Commands
       delete_session
     when 'rename'
       rename_session
-    when 'summarize'
-      opts = go_command('fs', opts)
-      if opts[?f] and
-        filename = switch_history(:filename) {
-          ask?(prompt: "❓ Enter filename: ")
-        }.full? { Pathname.new(_1) }
-      then
-        if filename.exist? && !confirm?(
-            prompt: "🔔 File #{filename.to_s.inspect} already exists, overwrite? (y/n) ",
-            yes: /\Ay/i
-          )
-        then
-          STDERR.puts "File not written!"
-          next :next
-        end
-        summary = summarize_session(pretty: true, sentence: opts[?s]) do |content|
-          infobar.puts kramdown_ansi_parse(content)
-        end
-        if summary.full?
-          filename.write(summary)
-          STDOUT.puts "File successfully written."
-          next :next
-        else
-          STDERR.puts "Nothing to summarize!"
-          next :next
-        end
-      end
-      summary = summarize_session(pretty: true, sentence: opts[?s]) do |content|
-        infobar.puts kramdown_ansi_parse(content) << ?\n
-      end
-      if summary.full?
-        use_pager do |output|
-          output.puts kramdown_ansi_parse(summary)
-        end
-      else
-        STDERR.puts "Nothing to summarize!"
-        next :next
-      end
     when 'change'
       change_session(name)
     when 'model options'
@@ -598,15 +559,16 @@ module OllamaChat::Commands
 
   command(
     name: :conversation,
-    regexp: %r(^/conversation\s+(clean|compact|save|load)(\s+-c)?(?:\s+([^-].*\.jsonl?))?$),
-    complete: [ 'conversation', %w[ save load clean compact ] ],
-    options: '[-c] [FILENAME]',
+    regexp: %r(^/conversation\s+(clean|compact|save|load|summarize|report)((?:\s+-(?:[sf]|c))*)(?:\s+([^-].*\.jsonl?))?$),
+    complete: [ 'conversation', %w[ save load clean compact summarize report ] ],
+    options: '[-s|-f|-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)
+      💾 Manage conversation content:
+         - save/load: Export/import as .json or .jsonl
+         - clean: Remove tool content, images, thinking
+         - compact: Summarize old messages, keep recent
+         - summarize: Per-message narrative (-s sentence, -f save)
+         - report: Generate a session report document
     EOT
   ) do |subcommand,opts,path|
     if %w[ save load ].include?(subcommand) && path.blank?
@@ -642,6 +604,12 @@ module OllamaChat::Commands
       else
         STDOUT.puts 'Cancelled.'
       end
+    when 'summarize'
+      opts = go_command('sf', opts)
+      summarize_conversation(save: opts[?f], sentence: opts[?s])
+    when 'report'
+      opts = go_command('f', opts)
+      report_conversation(save: opts[?f])
     end
     :next
   end
@@ -926,14 +894,14 @@ module OllamaChat::Commands
         read = -> pathname {
           STDOUT.puts "Reading #{pathname.to_s.inspect}."
           content = pathname.read
-          opts[?m] ? Term::ANSIColor.uncolor(content) : content
+          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 = Term::ANSIColor.uncolor(content) if opts[?m]
+        content = OllamaChat::Utils::StripANSI.strip_ansi(content) if opts[?m]
         content = edit_text(content) if opts[?e]
         content
       else
@@ -947,12 +915,12 @@ module OllamaChat::Commands
         patterns = extract_patterns(arg)
         next provide_file_set_content(patterns, all:, skip_blank: true) do |src|
           content = import(src)
-          opts[?m] ? Term::ANSIColor.uncolor(content) : content
+          opts[?m] ? OllamaChat::Utils::StripANSI.strip_ansi(content) : content
         end || :next
       elsif arg
         source = arg
         content = import(source) or next :next
-        content = Term::ANSIColor.uncolor(content) if opts[?m]
+        content = OllamaChat::Utils::StripANSI.strip_ansi(content) if opts[?m]
         content = edit_text(content) if opts[?e]
         content
       else

data/lib/ollama_chat/conversation.rb

@@ -26,12 +26,8 @@ module OllamaChat::Conversation
   # @example Save conversation with explicit filename
   #   chat.save_conversation('conversations/2023-10-15_my_session.json')
   def save_conversation(filename, clean: false)
-    if File.exist?(filename)
-      confirm?(
-        prompt: "🔔 File #{filename.to_s.inspect} already exists, overwrite? (y/n) ",
-        yes: /\Ay/i
-      ) or return
-    end
+    filename = Pathname.new(filename)
+    should_overwrite?(filename) or return
     if messages.save_conversation(filename, messages: clean ? messages.clean_messages : messages.messages)
       STDOUT.puts "Saved conversation to #{filename.to_s.inspect}."
     else

data/lib/ollama_chat/dialog.rb

@@ -149,4 +149,38 @@ module OllamaChat::Dialog
   def go_command(s, opt, defaults: {})
     Tins::GO.go(s, opt.to_s.strip.split(/\s+/), defaults:)
   end
+
+  # Prompts the user for a filename with history support.
+  #
+  # @param action [String, nil] an optional action descriptor appended to the
+  #   prompt, e.g. "for summarization" ("❓ Enter filename for summarization…")
+  #
+  # @return [Pathname, nil] the user-supplied filename as a Pathname, or nil
+  #   if the user cancels (C-c) or provides empty input
+  def ask_for_filename?(action: nil)
+    action and action = " #{action}"
+    switch_history(:filename) {
+      ask?(prompt: "❓ Enter filename#{action}, C-c ⇒ cancel: ")
+    }.full? { Pathname.new(_1) }
+  end
+
+  # Checks whether a file can be written, prompting for overwrite
+  # confirmation if the file already exists.
+  #
+  # @param filename [Pathname] the target file to check
+  #
+  # @return [Boolean] `true` if the file does not exist or the user confirms
+  #   overwriting; `false` if the file exists and the user declines
+  def should_overwrite?(filename)
+    if filename.exist? && !confirm?(
+        prompt: "🔔 File #{filename.to_s.inspect} already exists, overwrite? (y/n) ",
+        yes: /\Ay/i
+      )
+    then
+      STDERR.puts "File not written!"
+      false
+    else
+      true
+    end
+  end
 end

data/lib/ollama_chat/file_editing.rb

@@ -113,15 +113,12 @@ module OllamaChat::FileEditing
   def determine_valid_output_filename(action)
     switch_history(:filename) do
       loop do
-        filename_str = ask?(
-          prompt: "❓ Enter filename #{action}, C-c ⇒ cancel: "
-        )
-        if filename_str.nil?
+        filename = ask_for_filename?(action:)
+        unless filename
           STDOUT.puts "Cancelled."
           return nil
         end
 
-        filename = Pathname.new(filename_str)
         if filename.exist?
           STDERR.puts "File #{filename.to_path.inspect} already exists!"
         else

data/lib/ollama_chat/information.rb

@@ -80,6 +80,7 @@ module OllamaChat::Information
     output.puts <<~EOT
       Current Collection
         Name: #{bold{collection}}
+        Status: #{col&.enabled ? '✅' : '⛔'}
         Patterns: #{italic{col&.patterns&.join(' ')}}
         #Embeddings: #{@documents.size}
         #Tags: #{@documents.tags.size}

data/lib/ollama_chat/message_output.rb

@@ -89,17 +89,9 @@ module OllamaChat::MessageOutput
   #   error occurred
   def attempt_to_write_file(filename, content)
     path = Pathname.new(filename.to_s).expand_path
-    if !path.exist? ||
-        confirm?(
-          prompt: "🔔 File #{path.to_s.inspect} already exists, overwrite? (y/n) ",
-          yes: /\Ay/i
-        )
-    then
-      File.open(path, ?w) do |output|
-        output.write(content)
-      end
-    else
-      return
+    should_overwrite?(path) or return
+    File.open(path, ?w) do |output|
+      output.write(content)
     end
     true
   end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -151,21 +151,22 @@ prompts:
       - **Format**: [Markdown, plain text, code blocks, etc.]
       - **Vocabulary**: [Technical terms, slang, formal language]
       - **Structure**: [How you organize your responses]
+    context_template_suggest: |
+      Conversation History:
+      %{history}
+
+      Create and output text following this instruction:
+      %{instruction}
     session_summarize: |
-      Context is
+      Narrative so far:
 
       %{context}
 
-      Summarize the %{sender_name} message below in one %{unit}.
-
-      NEVER add any information to this message summary that already was included
-      in the context above.
-
-      Message
-
-      Thinking content was
-
-      %{message_thinking}
+      Extend the narrative above with the key contribution of the
+      %{sender_name} message below in one %{unit}. Skip tool-call
+      plumbing; focus on decisions, findings, and state changes. Do
+      not repeat information already present in the narrative.
+      Output only the summary text, without any sender name or prefix.
 
       Response content was
 
@@ -175,12 +176,26 @@ prompts:
 
       Create a title with a length of **less than %{length}** characters for
       the conversation above. Output only the title and nothing else.
-    context_template_suggest: |
-      Conversation History:
-      %{history}
+  session:
+    coding_brief: |
+      %{content}
 
-      Create and output text following this instruction:
-      %{instruction}
+      Write a brief of the session above. Your brief MUST:
+      - Describe the goal and how it evolved.
+      - Name key decisions, files, and architectural choices.
+      - State the current state: what works, what is pending.
+      - Be factual. Be concise.
+    roleplay_story: |
+      %{content}
+
+      Write a narrative retelling of the roleplay session
+      above. Your story MUST:
+      - Capture the emotional arc and key plot beats.
+      - Stay in the established setting and character voices.
+      - Use vivid, evocative prose; show, don't tell.
+      - Highlight turning points, revelations, and character
+        growth.
+      - Read it like a short story chapter, not a log.
   suggest:
     coding: |
       ## Context
@@ -318,25 +333,33 @@ prompts:
       
       ## Few-Shot Examples
       
-      Input: [Scene where a party is arguing in a rainy forest while being hunted]
-      Output:
-      Demand that everyone stop shouting and listen for the sound of footsteps in the brush.
+      Input: [Scene where a party is arguing in a rainy forest while being
+      hunted] Output: Demand that everyone stop shouting and listen for the
+      sound of footsteps in the brush.
       
-      Quietly admit to the party leader that you are terrified, leaning into their shoulder for support.
+      Quietly admit to the party leader that you are terrified, leaning into
+      their shoulder for support.
       
-      Examine the muddy tracks near the campfire to see if the hunters are human or something else. Roll 1d20.
+      Examine the muddy tracks near the campfire to see if the hunters are
+      human or something else. Roll 1d20.
       
-      Secretly slip the map out of the leader's pocket while they are distracted by the argument. Roll 1d20.
+      Secretly slip the map out of the leader's pocket while they are
+      distracted by the argument. Roll 1d20.
       
-      Raise your voice and challenge every single person present to state their true loyalty right now.
+      Raise your voice and challenge every single person present to state their
+      true loyalty right now.
       
-      Attempt to leap across the ravine to flank the hunters, risking a fall into the rapids. Roll 1d20.
+      Attempt to leap across the ravine to flank the hunters, risking a fall
+      into the rapids. Roll 1d20.
       
-      Obsessively polish your sword with a rag, ignoring the argument entirely until it is perfectly mirrored.
+      Obsessively polish your sword with a rag, ignoring the argument entirely
+      until it is perfectly mirrored.
       
-      Suddenly reveal that you were actually sent here by the enemy as a double agent.
+      Suddenly reveal that you were actually sent here by the enemy as a double
+      agent.
       
-      A sudden lightning strike hits a nearby tree, knocking everyone off balance and creating a deafening blast.
+      A sudden lightning strike hits a nearby tree, knocking everyone off
+      balance and creating a deafening blast.
       
       ## Output Format
       
@@ -356,7 +379,10 @@ prompts:
       conversation:
       %{groups}
 
-      Summarize the conversation above. Your narrative MUST:
+      The previous summary (if present) is a draft. Rewrite it
+      to incorporate the new conversation above. The result must
+      read as one continuous account of the entire session, not a
+      concatenation of two separate summaries. Your narrative MUST:
       - Name every file created or significantly modified (with
         path), and the key methods or classes they define.
       - State the architectural or design decisions made (e.g.
@@ -366,8 +392,8 @@ prompts:
       - Do NOT merely report test counts or coverage percentages;
         those are outcomes, not accomplishments.
       - Be factual; do not invent details not present in the groups
-        above. Keep it to 6–12 sentences.
-    assemble: |-
+        or previous summary above. Be concise; skip filler and repetition.
+    assemble: |
       %{narrative}
 
       tool_calls:
@@ -494,6 +520,10 @@ tools:
       result_display_timeout: 3
       cmd: |
         grep #{'-i' if ignore_case} -m #{max_results} -r #{before.full? { "-B %u " % it }}#{after.full? { "-A %u " % it }}#{context.full? { "-C %u " % it }}#{pattern} #{path}
+    execute_shell:
+      default: false
+      require_confirmation: false # Preflight confirm is skipped, but in-tool it's mandatory.
+      result_display_timeout: 0
     browse:
       result_display_timeout: 3
       default: true

data/lib/ollama_chat/prompt_management.rb

@@ -333,7 +333,7 @@ module OllamaChat::PromptManagement
       # Let the user write a suggestion instruction on the fly
       instruction = edit_text('').full? or return
     else
-      # Let the user pick a prompt template (e.g., suggest_coding, suggest_roleplaying)
+      # Let the user pick a prompt template (e.g., suggest.coding, suggest.roleplaying)
       instruction = choose_prompt(
         prompt: 'Which suggestion strategy shall we employ? %s',
         context: 'suggest'

data/lib/ollama_chat/rag_handling.rb

@@ -163,10 +163,11 @@ module OllamaChat::RAGHandling
     collections = all_collections.select(:name, :description, :enabled)
     use_pager do |output|
       collections.each { |c|
-        collection_name = current_collection == c.name ? bold { c.name } : c.name
+        enabled                = c.enabled ? '✅' : '⛔'
+        collection_name        = current_collection == c.name ? bold { c.name } : c.name
         collection_description = c.description
-        suffix = c.enabled ? '' : ' [DISABLED]'
-        output.puts '%s: %s%s' % [ collection_name, collection_description, suffix ]
+
+        output.puts '%s %s: %s' % [ enabled, collection_name, collection_description ]
       }
     end
   end