ollama_chat 0.0.116 → 0.0.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beebfc1a29093b596fe008ba59b2f377922e2f7beeeb529ebed899fc374c6e02
-  data.tar.gz: e704bce9b15101283e802a6010ee08c347cf94d8fcdc2ee785da3880debde736
+  metadata.gz: cbe0a034dee8079ea14e573b0e98624ebaa3311baaf60e1bd666d7f7b0d61dda
+  data.tar.gz: 2a2b0c1b00ce5db2fa4b20660d8cda86669f1bac50e62352a07953e0c327d863
 SHA512:
-  metadata.gz: 7cab4e5d47d97dd215e058ab9960ad8801252a2ab950d3b30ce1e514fad30b22e87f917e3b1764592070f385fcfec748cc3b59398cadf8e3553f41e6ec48e9bb
-  data.tar.gz: 0fb71bb0ab178cb1fed41ea2b257360fd19d3d180a2fc2f497d1372874d4665c3b82676ad8c056ab80a22e21e95deebb8afee8ef5f2809a07671e6cfb53ba5d7
+  metadata.gz: f187ae33f48c198b1aa15d680b5d7dd45e96c8ba7bcb71bf80adf5d0cb049a766d79d57d8bad32175363c490cfe94a94908b1eba4a1ba28a8b0e9896065079ed
+  data.tar.gz: 0d61b926d6e7018d5f21d52ed06d36e81ea859dc5f288a0247834def14245813f1306bf444baaf715c8ec37df20ea64d97f03279045e34eb669a29c9facadb23

data/CHANGES.md

@@ -1,5 +1,40 @@
 # Changes
 
+## 2026-09-03 v0.0.117
+
+*   Fixed `/favourite` subcommand completion rendering by replacing separate
+    `add`/`delete` and type arrays in `complete` with `.product`, ensuring each
+    subcommand renders as an explicit pair (e.g., `add model`, `delete
+    persona`) instead of being independently cross-multiplied by `arguments`.
+*   Added command categories to help output:
+    *   Added `category(name)` and `current_category` class methods to
+        `command_concern.rb` for tracking the active category during
+        registration.
+    *   Added `category:` keyword to `command` and `Command#initialize` with
+        `attr_reader :category`.
+    *   Reworked `help_message` to sort commands by `[category, name]` and
+        insert bold full-width category header rows via `colspan: 4`.
+    *   Added `extend Term::ANSIColor` to the `included` block for `bold{}`
+        access.
+    *   Replaced `## Section` comments in `commands.rb` with `category
+        :Section` calls.
+    *   Added two new categories: `Models` (`/model`, `/think`) and `Prompts`
+        (`/prompt`, `/system`, `/suggest`).
+    *   Moved session-persisted commands (`/toggle`, `/tools`, `/voice`,
+        `/document_policy`, `/context_format`) under `category :Session`.
+    *   Moved `/change_response` and `/conversation` under `category
+        :Conversation`.
+    *   Reduced `Settings` to app-level commands only (`/config`,
+        `/favourite`).
+*   Made `report_session` a pure generator:
+    *   Removed `&block` parameter and `block&.(result)` call from
+        `report_session`, eliminating the infobar side-effect that caused
+        double output.
+    *   Simplified `report_conversation` to call `report_session(name:)`
+        without a block; display logic (pager or file write) is the sole
+        consumer of the returned string.
+    *   Removed `@param block [Proc]` from `report_session` YARD docs.
+
 ## 2026-09-03 v0.0.116
 
 ### Added

data/lib/ollama_chat/command_concern.rb

@@ -11,6 +11,20 @@ module OllamaChat::CommandConcern
     #   `Command` instances.
     attr_accessor :commands
 
+    # @return [Symbol] the category currently in effect for new commands
+    def current_category
+      (@category || :Misc).to_sym
+    end
+
+    # Set the category that subsequent `command` registrations will be
+    # assigned to. Commands registered without an explicit `category:`
+    # keyword inherit the current category (defaults to `:Misc`).
+    #
+    # @param name [String, Symbol] the category name
+    def category(name)
+      @category = name.to_sym
+    end
+
     # Register a new command.
     #
     # @param name [String, Symbol] The primary name of the command.
@@ -24,17 +38,19 @@ module OllamaChat::CommandConcern
     # @param options [String, nil] A string describing command options
     #   for help output.
     # @param help [String, nil] Short help text for the command.
+    # @param category [Symbol] Category for grouping in help output
+    #   (defaults to `current_category`).
     # @yield [context] Block that receives a binding context for
     #   execution.  The block must be provided.
     #
     # @raise [ArgumentError] if a command with the same name already
     #   exists or if no block is given.
-    def command(name:, regexp:, complete: nil, optional: false, options: nil, help: nil, &block)
+    def command(name:, regexp:, complete: nil, optional: false, options: nil, help: nil, category: current_category, &block)
       name = name.to_sym
       commands.key?(name) and
         raise ArgumentError, "command #{name} already registered!"
-      commands[name] =Command.new(
-        name:, regexp:, complete:, optional:, options:, help:, &block
+      commands[name] = Command.new(
+        name:, regexp:, complete:, optional:, options:, help:, category:, &block
       )
     end
 
@@ -52,15 +68,18 @@ module OllamaChat::CommandConcern
     #
     # @param pattern [String, Regexp, nil] An optional pattern to filter
     #   commands by their names.
-    # @return [Terminal::Table] A table with columns CMD, SUBCMD, OPTS, HELP.
+    # @return [Terminal::Table] A table with columns CMD, SUBCMD, OPTS, HELP,
+    #   with bold category header rows inserted between groups.
     def help_message(pattern = nil)
       table = Terminal::Table.new
       table.style = {
         all_separators: true,
         border:         :unicode_round,
       }
-      table.headings = %w[ CMD SUBCMD OPTS HELP ]
-      commands.each_value do |command|
+      table.headings  = %w[ CMD SUBCMD OPTS HELP ]
+      sorted_commands = self.commands.sort_by { [ _2.category, _2.name ] }.map(&:last)
+      cat             = nil
+      sorted_commands.each do |command|
         command.help or next
         if pattern
           command.command_names.any? { _1 =~ pattern } or next
@@ -72,6 +91,10 @@ module OllamaChat::CommandConcern
               [ _1, (?﹡ unless command.optional?) ].compact.join
             }.sort.join(?\n)
         }
+        if cat != command.category
+          cat = command.category
+          table << [ { value: bold{cat}, colspan: 4 } ]
+        end
         table << [
           "%s" % command.command_names.map { ?/ + _1 }.join(?\n),
           '%s' % subcommands,
@@ -91,6 +114,8 @@ module OllamaChat::CommandConcern
     delegate :command_completions, to: self
 
     delegate :help_message, to: self
+
+    extend Term::ANSIColor
   end
 
   # Represents a registered command in the OllamaChat command DSL.
@@ -117,13 +142,14 @@ module OllamaChat::CommandConcern
     # @param optional [Boolean] Whether the command is optional.
     # @param options [String, nil] Options description.
     # @param help [String] Help text.
+    # @param category [Symbol] Category for grouping in help output.
     # @yield [context] Execution block.
     #
     # @raise [ArgumentError] if no block is given.
-    def initialize(name:, regexp:, complete: nil, optional: false, options: nil, help:, &block)
+    def initialize(name:, regexp:, complete: nil, optional: false, options: nil, help:, category:, &block)
       block or raise ArgumentError, 'require &block'
-      @name, @regexp, @optional, @options, @help, @block =
-        name, regexp, optional, options, help, block
+      @name, @regexp, @optional, @options, @help, @category, @block =
+        name, regexp, optional, options, help, category, block
       @complete = Array(complete || name.to_s).map { Array(_1) }
     end
 
@@ -133,6 +159,9 @@ module OllamaChat::CommandConcern
     # @return [String] Help text for the command.
     attr_reader :help
 
+    # @return [Symbol] Category for grouping in help output.
+    attr_reader :category
+
     # @return [String, nil] Options description.
     attr_reader :options
 

data/lib/ollama_chat/commands.rb

@@ -22,7 +22,7 @@ require 'ollama_chat/command_concern'
 module OllamaChat::Commands
   include OllamaChat::CommandConcern
 
-  ## Clipboard
+  category :Clipboard
 
   command(
     name: :copy,
@@ -58,7 +58,7 @@ module OllamaChat::Commands
     end
   end
 
-  ## Settings
+  category :Settings
 
   command(
     name: :config,
@@ -85,14 +85,67 @@ module OllamaChat::Commands
   end
 
   command(
-    name: :document_policy,
-    regexp: %r(^/document policy$),
-    complete: %w[ document policy ],
+    name: :favourite,
+    regexp: %r(^/favourite(?:\s+(add|delete))?(?:\s+(model|prompt|system|persona|suggest))$),
+    complete: [ 'favourite', %w[ add delete ].product(%w[ model prompt system persona suggest ]) ],
     help: <<~EOT
-      📜 Select a scanning policy for documents
+      \u2B50\uFE0F Manage favorites (add/delete models,
+         prompts, personae)
     EOT
-  ) do
-    document_policy.choose
+  ) do |subcommand, type|
+    case subcommand
+    when 'add'
+      add_favourite(type)
+    when 'delete'
+      delete_favourite(type)
+    end
+    :next
+  end
+
+  category :Session
+
+  command(
+    name: :session,
+    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: "[-p profile]\n[name]",
+    help: <<~EOT
+      💬 Manage sessions:
+         - list/new/delete/rename/duplicate
+         - change [name]/previous
+         - model options/change
+    EOT
+  ) do |subcommand, opts, name|
+    case subcommand
+    when nil
+      info_session
+    when 'list'
+      list_sessions
+    when 'new'
+      set_new_session
+    when 'duplicate'
+      duplicate_session
+    when 'delete'
+      delete_session
+    when 'rename'
+      rename_session
+    when 'change'
+      change_session(name)
+    when 'model options'
+      edit_session_model_options
+    when 'model options change'
+      opts = go_command('p:', opts)
+      if profile = opts[?p] || choose_profile_for_model(@model)
+        copy_model_options_to_session(profile:)
+      end
+    when 'previous'
+      if prev = previous_session
+        change_session(prev.id)
+      else
+        STDOUT.puts "No previous session defined."
+      end
+    end
     :next
   end
 
@@ -132,123 +185,6 @@ module OllamaChat::Commands
     :next
   end
 
-  command(
-    name: :favourite,
-    regexp: %r(^/favourite(?:\s+(add|delete))?(?:\s+(model|prompt|system|persona|suggest))$),
-    complete: [ 'favourite', %w[ add delete ], %w[ model prompt system persona suggest ] ],
-    help: <<~EOT
-      \u2B50\uFE0F Manage favorites (add/delete models,
-         prompts, personae)
-    EOT
-  ) do |subcommand, type|
-    case subcommand
-    when 'add'
-      add_favourite(type)
-    when 'delete'
-      delete_favourite(type)
-    end
-    :next
-  end
-
-  command(
-    name: :model,
-    regexp: %r(^/model(?:\s+(change|options(?: copy| delete| export| import)?|options from session|options to session))?((?:\s+(?:-m|-p\s+[\S]+))*)$),
-    complete: [ 'model', %w[ change options options\ copy options\ delete options\ export options\ import options\ from\ session options\ to\ session ] ],
-    options: '[-m|-p pattern]',
-    help: <<~EOT
-      🤖 Manage AI models & profiles:
-         - change: Switch active model
-         - options: Edit saved profile config
-         - options copy: Copy profile from another model
-         - options delete: Delete a saved profile
-         - options export: Export ALL model profiles to JSON
-         - options import: Selectively import profiles from JSON
-         - options from session: Save live → Saved
-         - options to session: Apply Saved → Live
-         -m interactively choose a model
-         -p PATTERN narrow file search for import
-    EOT
-  ) do |subcommand, opts|
-    if subcommand == 'change'
-      begin
-        model   = choose_model('', @model)
-        profile = choose_profile_for_model(model) || 'default'
-        use_model(model, profile:)
-      rescue OllamaChat::UnknownModelError => e
-        msg = "Caught #{e.class}: #{e}"
-        log(:error, msg, data: { command: 'model', profile: }, warn: true)
-      end
-      next :next
-    end
-    opts    = go_command('mp:', opts)
-    model   = opts[?m] ? choose_model('', @model) : @model
-    case subcommand
-    when 'options'
-      profile = choose_profile_for_model(model, allow_new: true) or next :next
-      edit_model_options(model, profile:)
-    when 'options copy'
-      copy_model_options_profile(model)
-    when 'options delete'
-      delete_model_options_profile(model)
-    when 'options from session'
-      profile = choose_profile_for_model(model) || 'default'
-      copy_model_options_from_session(model, profile:)
-    when 'options to session'
-      profile = choose_profile_for_model(model) || 'default'
-      copy_model_options_to_session(model, profile:)
-    when 'options export'
-      export_model_options
-    when 'options import'
-      pattern  = opts[?p] || '**/*.json'
-      filename = choose_filename(pattern) or next :next
-      import_model_options(filename)
-    end
-    :next
-  end
-
-  command(
-    name: :system,
-    regexp: %r(^/system(?:\s+(change))?$),
-    complete: [ 'system', %w[ change ] ],
-    optional: true,
-    help: <<~EOT,
-      🧬 Manage active system prompt (change)
-         Note: Use '/prompt -c system' for managing
-         (add, delete, edit, list, etc.) system templates.
-    EOT
-  ) do |subcommand, filename|
-    case subcommand
-    when 'change'
-      change_system_prompt(@messages.system_name)
-      @messages.show_system_prompt
-    when nil
-      @messages.show_system_prompt
-    end
-    :next
-  end
-
-  command(
-    name: :think,
-    regexp: %r(^/think$),
-    help: <<~EOT
-      🧠 Configure model thinking mode
-    EOT
-  ) do
-    think_mode.choose
-    :next
-  end
-
-  command(
-    name: :context_format,
-    regexp: %r(^/context_format$),
-    help: <<~EOT,
-      📐 Set context format (JSON|TOON)
-    EOT
-  ) do
-    context_format.choose
-    :next
-  end
-
   command(
     name: :tools,
     regexp: %r(^/tools(?:\s+(on|off|enable|disable))?),
@@ -287,54 +223,31 @@ module OllamaChat::Commands
     :next
   end
 
-  ## Session
-
   command(
-    name: :session,
-    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: "[-p profile]\n[name]",
+    name: :document_policy,
+    regexp: %r(^/document policy$),
+    complete: %w[ document policy ],
     help: <<~EOT
-      💬 Manage sessions:
-         - list/new/delete/rename/duplicate
-         - change [name]/previous
-         - model options/change
+      📜 Select a scanning policy for documents
     EOT
-  ) do |subcommand, opts, name|
-    case subcommand
-    when nil
-      info_session
-    when 'list'
-      list_sessions
-    when 'new'
-      set_new_session
-    when 'duplicate'
-      duplicate_session
-    when 'delete'
-      delete_session
-    when 'rename'
-      rename_session
-    when 'change'
-      change_session(name)
-    when 'model options'
-      edit_session_model_options
-    when 'model options change'
-      opts = go_command('p:', opts)
-      if profile = opts[?p] || choose_profile_for_model(@model)
-        copy_model_options_to_session(profile:)
-      end
-    when 'previous'
-      if prev = previous_session
-        change_session(prev.id)
-      else
-        STDOUT.puts "No previous session defined."
-      end
-    end
+  ) do
+    document_policy.choose
+    :next
+  end
+
+  command(
+    name: :context_format,
+    regexp: %r(^/context_format$),
+    help: <<~EOT,
+      📐 Set context format (JSON|TOON)
+    EOT
+  ) do
+    context_format.choose
     :next
   end
 
-  ## Conversation
+
+  category :Conversation
 
   command(
     name: :list,
@@ -447,6 +360,77 @@ module OllamaChat::Commands
     content
   end
 
+  command(
+    name: :change_response,
+    regexp: %r(^/change response$),
+    complete: %w[ change response ],
+    help: <<~EOT,
+      ✏️ Edit last AI response in editor
+    EOT
+  ) do
+    change_response
+    :next
+  end
+
+  command(
+    name: :conversation,
+    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
+      💾 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?
+      STDERR.puts "Require a path as argument to save/load!"
+      next :next
+    end
+    case subcommand
+    when 'save'
+      opts = go_command('c', opts.to_s)
+      save_conversation(path, clean: opts[?c])
+    when 'load'
+      load_conversation(path)
+      repair_group_uuids
+    when 'clean'
+      if confirm?(
+          prompt: '🔔 Clean tool content, images, and thinking from conversation? (y/n) ',
+          yes: /\Ay/i
+        )
+      then
+        messages.clean_messages!
+        session_sync
+        STDOUT.puts "Conversation cleaned."
+      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
+    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
+
+  category :Prompts
+
   command(
     name: :prompt,
     regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|rename|sync|-e))?(\s+(?:-[ef]|-c\s+(?:\w+|\?)))?(?:\s+([^-].*))?$),
@@ -528,6 +512,27 @@ module OllamaChat::Commands
     :next
   end
 
+  command(
+    name: :system,
+    regexp: %r(^/system(?:\s+(change))?$),
+    complete: [ 'system', %w[ change ] ],
+    optional: true,
+    help: <<~EOT,
+      🧬 Manage active system prompt (change)
+         Note: Use '/prompt -c system' for managing
+         (add, delete, edit, list, etc.) system templates.
+    EOT
+  ) do |subcommand, filename|
+    case subcommand
+    when 'change'
+      change_system_prompt(@messages.system_name)
+      @messages.show_system_prompt
+    when nil
+      @messages.show_system_prompt
+    end
+    :next
+  end
+
   command(
     name: :suggest,
     regexp: %r(^/suggest(\s+(?:-e))?$),
@@ -545,76 +550,76 @@ module OllamaChat::Commands
     :next
   end
 
-  command(
-    name: :change_response,
-    regexp: %r(^/change response$),
-    complete: %w[ change response ],
-    help: <<~EOT,
-      ✏️ Edit last AI response in editor
-    EOT
-  ) do
-    change_response
-    :next
-  end
+  category :Models
 
   command(
-    name: :conversation,
-    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]',
+    name: :model,
+    regexp: %r(^/model(?:\s+(change|options(?: copy| delete| export| import)?|options from session|options to session))?((?:\s+(?:-m|-p\s+[\S]+))*)$),
+    complete: [ 'model', %w[ change options options\ copy options\ delete options\ export options\ import options\ from\ session options\ to\ session ] ],
+    options: '[-m|-p pattern]',
     help: <<~EOT
-      💾 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
+      🤖 Manage AI models & profiles:
+         - change: Switch active model
+         - options: Edit saved profile config
+         - options copy: Copy profile from another model
+         - options delete: Delete a saved profile
+         - options export: Export ALL model profiles to JSON
+         - options import: Selectively import profiles from JSON
+         - options from session: Save live → Saved
+         - options to session: Apply Saved → Live
+         -m interactively choose a model
+         -p PATTERN narrow file search for import
     EOT
-  ) do |subcommand,opts,path|
-    if %w[ save load ].include?(subcommand) && path.blank?
-      STDERR.puts "Require a path as argument to save/load!"
+  ) do |subcommand, opts|
+    if subcommand == 'change'
+      begin
+        model   = choose_model('', @model)
+        profile = choose_profile_for_model(model) || 'default'
+        use_model(model, profile:)
+      rescue OllamaChat::UnknownModelError => e
+        msg = "Caught #{e.class}: #{e}"
+        log(:error, msg, data: { command: 'model', profile: }, warn: true)
+      end
       next :next
     end
+    opts    = go_command('mp:', opts)
+    model   = opts[?m] ? choose_model('', @model) : @model
     case subcommand
-    when 'save'
-      opts = go_command('c', opts.to_s)
-      save_conversation(path, clean: opts[?c])
-    when 'load'
-      load_conversation(path)
-      repair_group_uuids
-    when 'clean'
-      if confirm?(
-          prompt: '🔔 Clean tool content, images, and thinking from conversation? (y/n) ',
-          yes: /\Ay/i
-        )
-      then
-        messages.clean_messages!
-        session_sync
-        STDOUT.puts "Conversation cleaned."
-      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
-    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])
+    when 'options'
+      profile = choose_profile_for_model(model, allow_new: true) or next :next
+      edit_model_options(model, profile:)
+    when 'options copy'
+      copy_model_options_profile(model)
+    when 'options delete'
+      delete_model_options_profile(model)
+    when 'options from session'
+      profile = choose_profile_for_model(model) || 'default'
+      copy_model_options_from_session(model, profile:)
+    when 'options to session'
+      profile = choose_profile_for_model(model) || 'default'
+      copy_model_options_to_session(model, profile:)
+    when 'options export'
+      export_model_options
+    when 'options import'
+      pattern  = opts[?p] || '**/*.json'
+      filename = choose_filename(pattern) or next :next
+      import_model_options(filename)
     end
     :next
   end
 
-  ## Collection
+  command(
+    name: :think,
+    regexp: %r(^/think$),
+    help: <<~EOT
+      🧠 Configure model thinking mode
+    EOT
+  ) do
+    think_mode.choose
+    :next
+  end
+
+  category :Collection
 
   command(
     name: :collection,
@@ -666,7 +671,7 @@ module OllamaChat::Commands
     :next
   end
 
-  ## Persona
+  category :Persona
 
   command(
     name: :persona,
@@ -788,7 +793,7 @@ module OllamaChat::Commands
     end
   end
 
-  ## Input
+  category :Input
 
   command(
     name: :compose,
@@ -930,7 +935,7 @@ module OllamaChat::Commands
     end
   end
 
-  ## Output
+  category :Output
 
   command(
     name: :pipe,
@@ -977,7 +982,7 @@ module OllamaChat::Commands
     :next
   end
 
-  ## Actions
+  category :Actions
 
   command(
     name: :reconnect,
@@ -1003,7 +1008,7 @@ module OllamaChat::Commands
     quit_app
   end
 
-  ## Information
+  category :Information
 
   command(
     name: :info,
@@ -1072,5 +1077,4 @@ module OllamaChat::Commands
     STDOUT.puts "Type /quit to quit."
     :next
   end
-
 end

data/lib/ollama_chat/session_management.rb

@@ -425,9 +425,8 @@ module OllamaChat::SessionManagement
   # stays bounded even after multiple compaction rounds.
   #
   # @param name [String, nil] specific template name (skips chooser)
-  # @param block [Proc] a block to handle the report content
   # @return [String, nil] the report or nil if empty
-  def report_session(name: nil, &block)
+  def report_session(name: nil)
     content = messages.compacted_messages.inject('') do |c, message|
       message.content.present? or next c
       sender = sender_name_displayed(message)
@@ -445,9 +444,7 @@ module OllamaChat::SessionManagement
                end
     template or return
 
-    result = generate(prompt: template.to_s % { content: })
-    block&.(result)
-    result
+    generate(prompt: template.to_s % { content: })
   end
 
   # Generates a report and displays or saves the result.
@@ -458,9 +455,7 @@ module OllamaChat::SessionManagement
     if save
       filename = ask_for_filename?(action: 'for report') or return
       should_overwrite?(filename) or return
-      result = report_session(name:) do |content|
-        infobar.puts kramdown_ansi_parse(content)
-      end
+      result = report_session(name:)
       if result.full?
         filename.write(result)
         STDOUT.puts "File successfully written."
@@ -468,9 +463,7 @@ module OllamaChat::SessionManagement
         STDERR.puts "Nothing to report!"
       end
     else
-      result = report_session(name:) do |content|
-        infobar.puts kramdown_ansi_parse(content) << ?\n
-      end
+      result = report_session(name:)
       if result.full?
         use_pager do |output|
           output.puts kramdown_ansi_parse(result)

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.116'
+  VERSION         = '0.0.117'
   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.116 ruby lib
+# stub: ollama_chat 0.0.117 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.116".freeze
+  s.version = "0.0.117".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/spec/ollama_chat/session_management_spec.rb

@@ -352,10 +352,8 @@ describe OllamaChat::SessionManagement do
       expect(chat).to receive(:choose_prompt).and_return(double(to_s: '%{content}'))
       expect(chat).to receive(:generate).and_return('Generated report')
 
-      results = []
-      result = chat.report_session { |c| results << c }
+      result = chat.report_session
       expect(result).to eq('Generated report')
-      expect(results).to eq(['Generated report'])
     end
 
     it 'returns nil when no messages have content' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.116
+  version: 0.0.117
 platform: ruby
 authors:
 - Florian Frank