ollama_chat 0.0.97 → 0.0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e62a371bea41c14f117fc546d3acf8e8a22d6c7f3be71a06f5dbb9f76a0201
-  data.tar.gz: 1348fecdb529bd12784e3843fcee09228d422db9f82a06554e6cf1923d318971
+  metadata.gz: '0818076703ebd6e8d8babbe5898a6a0069863ce7cebf18658f70e8d4b5592c51'
+  data.tar.gz: 7e9f768d41bff3560c2d22ac20ace84da0b580b3b17f8f9d1ffd3522af5d8db1
 SHA512:
-  metadata.gz: f53884d1050759f8d32731f872e3746f92fc3b9747ecfdb12015bafc39cd98dd1e3fc977c831f116a7b95ece70fd8fc2cbfc760803d06207a2cf49584138a6de
-  data.tar.gz: 78144c20b98504852ce74ce33709b9a5592865d9fc75c49edc5cb23ce93a767275d5f090c38d77450be6e503b5b37cdbe895650b25f0e07f91cb118d8a7f59dc
+  metadata.gz: 4864950b3246106793b51ffe74e3ead6dad4683f1b9fcaf710bf7f672264c646dc90dacdbcef437725b725230b8d0b70938045729ca982c83845ebce41bb773d
+  data.tar.gz: 5b99426668efc34bbb89a17faf2dcf016c1a6ada4c69d44882ebb40bcb836907741f96b5fb66ee99ea75b78abbdd34069ddbc186d525acd015302bcea95e55a7

data/CHANGES.md

@@ -1,5 +1,71 @@
 # Changes
 
+## 2026-07-13 v0.0.99
+
+### Changed
+
+- **Command Handling & UX**
+    - Updated regexes for `/system`, `/session`, `/prompt`, `/conversation`,
+      `/character`, `/input`, `/pipe`, and `/output` in
+      `lib/ollama_chat/commands.rb` to prevent positional arguments from
+      starting with a hyphen.
+    - Enhanced warning messages in `lib/ollama_chat/message_list.rb` to include
+      explicit suggestions for `/drop` and `/regenerate`.
+
+- **LLM & Prompt Management**
+    - Updated the `generate` method in `lib/ollama_chat/chat.rb` to capture
+      output in `content` and implemented conditional logging ( `:warn` for
+      empty results, `:info` otherwise).
+    - Added `.full? or return` guard clauses to `edit_text('')` and
+      `generate(prompt: full_prompt)` within
+      `lib/ollama_chat/prompt_management.rb`.
+    - Overhauled the `suggest_coding` prompt in `default_config.yml` to adopt a
+      Senior Software Architect and Technical Auditor persona.
+    - Overhauled the `suggest_roleplaying` prompt in `default_config.yml` to
+      adopt a Narrative Consultant and Game Master's Assistant persona.
+
+- **Tools**
+    - Modified `OllamaChat::Tools::CopyToClipboard` to make the `text`
+      parameter required.
+    - Updated `lib/ollama_chat/tools/copy_to_clipboard.rb` to raise
+      `OllamaChat::ToolFunctionArgumentError` if `text` is missing and
+      simplified the success message.
+
+- **Refactoring & Internal Improvements**
+    - Adopted Ruby shorthand for keyword arguments in:
+        - `set_default_persona_name` and `load_personae`
+          (`lib/ollama_chat/personae_management.rb`).
+        - `choose_prompt` via the `default` parameter
+          (`lib/ollama_chat/prompt_management.rb`).
+        - `OllamaChat::Chat` instantiation using `argv` in specs.
+        - The `topic` parameter in `spec/ollama_chat/tools/execute_ri_spec.rb`.
+        - The `url` parameter in `spec/ollama_chat/tools/get_url_spec.rb`.
+
+## 2026-07-09 v0.0.98
+
+### Added
+
+- Implemented `prefill_prompt` getter and setter in `lib/ollama_chat/chat.rb`
+  with accompanying YARD documentation.
+
+### Changed
+
+- Updated `lib/ollama_chat/commands.rb` to persist the result of
+  `suggest_prompts` as `self.prefill_prompt`, allowing prefilled prompts to be
+  stored in history for reuse and modification.
+- Refactored call sites in `lib/ollama_chat/chat.rb`,
+  `lib/ollama_chat/commands.rb`, and `lib/ollama_chat/personae_management.rb`
+  to use the `self.prefill_prompt` interface instead of the `@prefill_prompt`
+  instance variable.
+- Wrapped the output of the `info` subcommand in `use_pager` within
+  `lib/ollama_chat/commands.rb`.
+- Added a confirmation message to the `import` subcommand in
+  `lib/ollama_chat/commands.rb`.
+- Refined the description of the `directory_structure` tool in
+  `lib/ollama_chat/tools/directory_structure.rb` to include warnings regarding
+  token usage and the exponential growth of nodes relative to the `max_depth`
+  parameter.
+
 ## 2026-07-06 v0.0.97
 
 ### New Features

data/lib/ollama_chat/chat.rb

@@ -255,7 +255,7 @@ class OllamaChat::Chat
       ),
     ]
 
-    ollama.chat(
+    content = ollama.chat(
       model:    @model,
       messages: ,
       options:  model_options,
@@ -263,6 +263,20 @@ class OllamaChat::Chat
       think:    false,
       tools:
     )&.message&.content.to_s
+
+    if content.empty?
+      log(
+        :warn,
+        "Sent #{prompt.inspect} to LLM for generation, received no content!"
+      )
+    else
+      log(
+        :info,
+        "Sent #{prompt.inspect} to LLM for generation, received #{content.inspect}"
+      )
+    end
+
+    content
   end
 
   private
@@ -302,6 +316,18 @@ class OllamaChat::Chat
     !!@parse_content
   end
 
+  # Returns whether there is a prompt waiting to be prefilled into the input buffer.
+  #
+  # @return [Boolean] true if a prefill prompt exists and is not empty, false otherwise
+  def prefill_prompt
+    @prefill_prompt.full?
+  end
+
+  # Sets the content to be prefilled into the next user input prompt.
+  #
+  # @param prefill_prompt [String, nil] The text to prefill, or nil to clear it
+  attr_writer :prefill_prompt
+
   # Handles user input commands and processes chat interactions.
   #
   # @param content [String] The input content to process
@@ -388,10 +414,10 @@ class OllamaChat::Chat
         tools_were_called and type = :tool_input
         unless tools_were_called
           content = enable_command_completion do
-            if prefill_prompt = @prefill_prompt.full?
+            if prefill_prompt
               Reline.pre_input_hook = -> {
                 Reline.insert_text prefill_prompt.gsub(/\n*\z/, '')
-                @prefill_prompt = nil
+                self.prefill_prompt = nil
               }
             else
               Reline.pre_input_hook = nil

data/lib/ollama_chat/commands.rb

@@ -170,7 +170,7 @@ module OllamaChat::Commands
 
   command(
     name: :system,
-    regexp: %r(^/system(?:\s+(change|info|edit|add|delete|list|duplicate|export|import|reset))?(?:\s+(\S+))?$),
+    regexp: %r(^/system(?:\s+(change|info|edit|add|delete|list|duplicate|export|import|reset))?(?:\s+([^-].*))?$),
     complete: [ 'system', %w[ change info edit add delete list duplicate export import reset ] ],
     optional: true,
     help: <<~EOT
@@ -285,7 +285,7 @@ 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+(.+))?$),
+    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 ] ],
     optional: true,
     options: "[-s|-f|-p profile]\n[name]",
@@ -490,7 +490,7 @@ module OllamaChat::Commands
 
   command(
     name: :prompt,
-    regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|suggest|-e))?(\s+-e)?(?:\s+(\S+))?$),
+    regexp: %r(^/prompt(?:\s+(edit|info|add|delete|list|duplicate|import|export|reset|suggest|-e))?(\s+-e)?(?:\s+([^-].*))?$),
     complete: [ 'prompt', %w[ edit info add delete list duplicate import export reset suggest ] ],
     optional: true,
     help: <<~EOT,
@@ -536,14 +536,16 @@ module OllamaChat::Commands
       end
     when 'suggest'
       opts   = go_command('e', opts)
-      prompt = suggest_prompts(edit: opts[?e]) and next prompt
+      if prompt = suggest_prompts(edit: opts[?e])
+        self.prefill_prompt = prompt
+      end
     when nil, '-e'
       if prompt = choose_prompt(prompt: 'Which template shall guide the next response? %s').full?(&:to_s)
         if subcommand
           prompt = edit_text(prompt)
           next prompt
         else
-          @prefill_prompt = prompt
+          self.prefill_prompt = prompt
         end
       end
     end
@@ -562,7 +564,7 @@ module OllamaChat::Commands
 
   command(
     name: :conversation,
-    regexp: %r(^/conversation\s+(save|load)((?:\s+-(?:[c]))*)\s+(.+)$),
+    regexp: %r(^/conversation\s+(save|load)((?:\s+-(?:[c]))*)\s+([^-].*)$),
     complete: [ 'conversation', %w[ save load ] ],
     options: '[-c]',
     help: <<~EOT
@@ -694,7 +696,7 @@ module OllamaChat::Commands
 
   command(
     name: :character,
-    regexp: %r(^/character(?:\s+(info|load|import))(?:\s+(\S+))?$),
+    regexp: %r(^/character(?:\s+(info|load|import))(?:\s+([^-].+))?$),
     complete: [ 'character', %w[ info load import ] ],
     help: <<~EOT
       Display character info, load or import a character
@@ -734,13 +736,16 @@ module OllamaChat::Commands
     }
     case subcommand
     when 'info'
-      puts json_to_yaml.(data)
+      use_pager do |output|
+        output.puts json_to_yaml.(data)
+      end
       :next
     when 'load'
       disable_content_parsing
       data
     when 'import'
-      import_persona_from_json(data)
+      persona_name = import_persona_from_json(data)
+      STDOUT.puts "Imported character as persona %s." % persona_name.to_s.inspect
       :next
     end
   end
@@ -767,7 +772,7 @@ module OllamaChat::Commands
 
   command(
     name: :input,
-    regexp: %r(^/input(?:\s+(path|context|embedding|summary)(?:\s*(?=\z))?)?((?:\s+-(?:[apre]|c\s*\w+|w\s*\d+|t\s*[-\w\.]+(?:,[-\w\.]+)*))*)(?:\s+(.+))?$),
+    regexp: %r(^/input(?:\s+(path|context|embedding|summary)(?:\s*(?=\z))?)?((?:\s+-(?:[apre]|c\s*\w+|w\s*\d+|t\s*[-\w\.]+(?:,[-\w\.]+)*))*)(?:\s+([^-].*))?$),
     optional: true,
     complete: [ 'input', %w[ path context embedding summary ] ],
     options: "[\n  -w|-a|-p|-e|\n  -c <collection>|\n  -t <tags>\n]\n[arg…]",
@@ -886,7 +891,7 @@ module OllamaChat::Commands
 
   command(
     name: :pipe,
-    regexp: %r(^/pipe(\s+-e)?\s+(.+)$),
+    regexp: %r(^/pipe(\s+-e)?\s+([^-].*)$),
     options: 'path',
     help: <<~EOT
      Pipe the last response into another command's stdin.
@@ -913,7 +918,7 @@ module OllamaChat::Commands
 
   command(
     name: :output,
-    regexp: %r(^/output(\s+-e)?\s+(.+)$),
+    regexp: %r(^/output(\s+-e)?\s+([^-].*)$),
     options: '[-e] path',
     help: <<~EOT
       Save the last response to a file.

data/lib/ollama_chat/message_list.rb

@@ -277,11 +277,11 @@ class OllamaChat::MessageList
         )
         msg = <<~EOT
 
-          ⚠️ Last message is actually #{bold{'user message'}}, see:
+          ⚠️ Last message is actually a #{bold{'user message'}}, see:
 
           #{message_content}
 
-          You might want to drop it.
+          You might want to /drop it or /regenerate it.
         EOT
         output.puts msg
       end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -172,33 +172,165 @@ prompts:
 
     %{content}
   suggest_coding: |
-    Analyze the conversation history above. Generate exactly 3 distinct,
-    concise follow-up prompts that the user might want to ask next to further
-    their goal. 
+    ## Context
 
-    Criteria:
-    1. One prompt should dive deeper into the current technical implementation.
-    2. One prompt should challenge a potential edge case or optimization.
-    3. One prompt should suggest a logical next step or a broader architectural question.
+    You are acting as a Senior Software Architect and Technical Auditor. Your goal
+    is to analyze the conversation history between a developer and an AI to
+    identify technical blind spots, architectural risks, and optimization
+    opportunities. You do not just summarize; you challenge the current
+    implementation to ensure it is production-ready, scalable, and maintainable.
 
-    Output only the text of these suggestions, separated by an empty line, 
-    without any numbering, bullet points, or introductory text.
+    ## Task
+
+    Analyze the provided Conversation History. Generate exactly 8 distinct, concise
+    follow-up prompts that the user could ask next to further their goal from a
+    professional engineering perspective.
+
+    Each prompt must map strictly to one of these categories:
+
+    1. **Technical Deep-Dive**: A tactical inquiry into the immediate
+       implementation details or logic flow.
+    2. **Edge Case/Optimization**: A stress test identifying where the logic
+       breaks, fails silently, or degrades in performance.
+    3. **Complexity & Scale**: An analysis of Big O, memory pressure, or
+       concurrency (e.g., "How does this behave under 100x load?").
+    4. **Maintainability & Debt**: An evaluation of clean code principles and
+       whether the current approach introduces future technical debt.
+    5. **Alternative Trade-offs**: A "Plan B" challenge suggesting a different
+       design pattern, library, or architectural approach.
+    6. **Verification & Testing**: A request for a programmatic verification
+       strategy (e.g., boundary value analysis or mocking dependencies).
+    7. **Knowledge Transfer & Documentation**: An inquiry about updating API
+       contracts, READMEs, or creating an Architectural Decision Record (ADR).
+    8. **Strategic Next Step**: A high-level roadmap question connecting this
+       tactical win to the broader system architecture.
+
+    ## Constraints
+
+    - **Quantity**: Exactly 8 suggestions.
+    - **Tone**: Rigorous, auditing, and senior. Avoid passive phrasing ("Maybe you
+      could...") in favor of critical analysis ("This approach risks X; how do we
+      resolve it?").
+    - **Negative Constraints**: 
+        - DO NOT use numbering or bullet points.
+        - DO NOT include introductory or concluding text.
+        - DO NOT suggest generic, superficial questions (e.g., "How does this
+          work?").
+    - **Conciseness**: Each prompt must be a single, punchy sentence.
+
+    ## Few-Shot Examples
+
+    **Input:** [User and AI just implemented a Ruby method to parse a large JSON
+    file into a database]
+
+    **Output:**
+
+    Can we refactor the parser to use a stream-based approach instead of loading
+    the entire JSON into memory?
+
+    How does this implementation handle malformed JSON or missing keys in the
+    middle of a 2GB file without crashing the process?
+
+    What is the time complexity of the current insert logic, and can we implement
+    bulk inserts to reduce database round trips?
+
+    Does the current naming convention for these helper methods align with our
+    project's style guide, or are we introducing cognitive load for future
+    maintainers?
+
+    Would using a dedicated library like Oj provide significant performance gains
+    over the standard JSON implementation here?
+
+    What specific boundary cases should be covered in the RSpec suite to ensure the
+    parser doesn't truncate data on trailing whitespace?
+
+    Which sections of the API documentation need to be updated to reflect this
+    change in the data ingestion pipeline?
+
+    Now that parsing is solved, how does this integrate into our overall background
+    job queue and retry logic?
+
+    ## Output Format
+
+    Output only the 8 suggestions as plain text, each separated by one empty line.
+    No other characters or formatting.
   suggest_roleplaying: |
-    Analyze the conversation history and the current narrative state of this
-    roleplay/story. Generate exactly 3 distinct, concise prompts that the
-    user could use to respond as their character.
-
-    Criteria:
-    1. One prompt should be an active choice or bold action that pushes the
-       plot forward or creates tension.
-    2. One prompt should focus on character interaction, exploring emotional
-       depth, a social reaction, or a subtle nuance in dialogue.
-    3. One prompt should introduce a sudden complication, a risky gamble, or an
-       unexpected event. This prompt MUST explicitly include a suggested dice roll
-       (e.g., "Roll 1d20") to determine the success or failure of the action.
-
-    Output only the text of these suggestions, separated by an empty line, 
-    without any numbering, bullet points, or introductory text.
+    ## Context
+    
+    You are an expert Narrative Consultant and Game Master's Assistant. Your
+    purpose is to analyze a roleplay conversation history and provide high-value,
+    diverse action prompts that help a player overcome writer's block while
+    deepening the story.
+    
+    ## Task
+    
+    Analyze the provided Conversation History and current narrative state. Generate
+    exactly 9 distinct, concise prompt suggestions that the user could use as their
+    character's next response.
+    
+    Each suggestion must map to one of these specific categories:
+    
+    1. Plot Driver: A bold action or choice that advances the plot or increases
+       tension.
+    2. Emotional Core: An interaction focusing on emotional depth, social nuance,
+       or psychological reaction.
+    3. World Insight: Investigating an object or detail in the environment. Include
+       a suggested dice roll (e.g., "Roll 1d20") if there is an inherent risk of
+       failure or a need for high skill.
+    4. Hidden Agenda: An action involving secrecy, deception, or private motives.
+       Include a suggested dice roll (e.g., "Roll 1d20") if the action risks
+       discovery.
+    5. Social Catalyst: A prompt that engages all characters currently present in
+       the scene to force group interaction.
+    6. High Stakes: A risky gamble or sudden complication. This MUST explicitly
+       include a suggested dice roll (e.g., "Roll 1d20").
+    7. Character Quirk: A response rooted in the character's specific flaws,
+       habits, or obsessions.
+    8. Meta-Pivot: An abrupt shift in scene direction via a revelation, surprising
+       admission, or sudden change of heart.
+    9. The Curveball: An unexpected external event or realization that forces an
+       immediate reaction.
+    
+    ## Constraints
+    
+    - Generate exactly 9 suggestions.
+    - Each suggestion must be concise and punchy.
+    - Negative Constraints: Do not use numbering, bullet points, or
+      introductory/concluding text. Avoid generic clichés (e.g., "I can't believe
+      this" or "What do we do now?").
+    - Ensure the tone of the suggestions aligns with the established voice of the
+      characters in the history.
+    
+    ## Variables
+    
+    - Conversation History: The provided log of messages between players and AI.
+    
+    ## 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.
+    
+    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.
+    
+    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.
+    
+    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.
+    
+    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.
+    
+    ## Output Format
+    
+    Output only the 9 suggestions as plain text, each separated by one empty line.
+    No other text.
 system_prompts:
   default: <%= OC::OLLAMA::CHAT::SYSTEM || "%{persona}\n\n%{runtime_info}".inspect %>
   persona: |

data/lib/ollama_chat/personae_management.rb

@@ -73,7 +73,7 @@ module OllamaChat::PersonaeManagement
   def set_default_persona_name(persona_name)
     if persona_name.present? && persona_name != :none
       @default_persona_name = Pathname.new(persona_name).basename.sub_ext('').to_path
-      @session.update(default_persona_name: default_persona_name)
+      @session.update(default_persona_name:)
     else
       @session.update(default_persona_name: nil)
       @default_persona_name = nil
@@ -269,7 +269,7 @@ module OllamaChat::PersonaeManagement
     persona = choose_persona(prompt: "Which persona's path do you need? %s") or return
     path = persona_name_to_pathname(persona).to_s
     perform_copy_to_clipboard(text: path, edit: false)
-    no_prefill or @prefill_prompt = path
+    no_prefill or self.prefill_prompt = path
     path
   end
 
@@ -403,7 +403,7 @@ module OllamaChat::PersonaeManagement
   def load_personae
     chosen = Set[]
     choose_with_state do
-      while persona = choose_persona(chosen: chosen, prompt: 'Who else should join the conversation? %s')
+      while persona = choose_persona(chosen:, prompt: 'Who else should join the conversation? %s')
         persona == :none and next
         chosen << persona
       end

data/lib/ollama_chat/prompt_management.rb

@@ -31,7 +31,7 @@ module OllamaChat::PromptManagement
   # @return [OllamaChat::Database::Models::Prompt, nil] the selected prompt
   #   model, or nil if the user chooses '[EXIT]' or cancels the selection.
   def choose_prompt(default: nil, prompt: 'Select a prompt template: %s')
-    prompts = all_prompts(default: default)
+    prompts = all_prompts(default:)
     prompts.unshift('[EXIT]')
     case chosen = choose_entry(prompts, prompt:)
     when '[EXIT]', nil
@@ -246,7 +246,7 @@ module OllamaChat::PromptManagement
     instruction = nil
     if edit
       # Let the user write a suggestion instruction on the fly
-      instruction = edit_text('')
+      instruction = edit_text('').full? or return
     else
       # Let the user pick a prompt template (e.g., suggest_coding, suggest_roleplaying)
       instruction = choose_prompt(prompt: 'Which suggestion strategy shall we employ? %s') or return
@@ -263,7 +263,7 @@ module OllamaChat::PromptManagement
     EOT
 
     # Execute a silent chat oneshot call (doesn't add to history)
-    suggestions  = generate(prompt: full_prompt)
+    suggestions  = generate(prompt: full_prompt).full? or return
 
     # Pass the AI's suggestions through the editor for final refinement
     edit_text(suggestions)

data/lib/ollama_chat/tools/copy_to_clipboard.rb

@@ -1,11 +1,8 @@
-# A tool for copying the last assistant response to the clipboard.
+# A tool for copying a text to the clipboard.
 #
 # The executable used for the copy operation is read from the configuration
 # under `copy.executable`.  The default configuration ships with
 # `ctc` – a small CLI that copies stdin to the system clipboard.
-#
-# The tool has no parameters; it simply grabs the most recent response
-# from the chat instance and streams it to the executable.
 class OllamaChat::Tools::CopyToClipboard
   include OllamaChat::Tools::Concern
 
@@ -20,9 +17,8 @@ class OllamaChat::Tools::CopyToClipboard
       function: Tool::Function.new(
         name:,
         description: <<~EOT,
-          Clipboard helper – Copies supplied string (or last assistant reply if
-          omitted) into the OS clipboard, enabling quick pasting elsewhere. No
-          output.
+          Clipboard helper – Copies supplied string into the OS clipboard,
+          enabling quick pasting elsewhere. No output.
         EOT
         parameters: Tool::Function::Parameters.new(
           type: 'object',
@@ -36,7 +32,7 @@ class OllamaChat::Tools::CopyToClipboard
               description: 'True if the copied text should be edited by the user, (default: false)'
             )
           },
-          required: []
+          required: %w[ text ]
         )
       )
     )
@@ -51,17 +47,12 @@ class OllamaChat::Tools::CopyToClipboard
   def execute(tool_call, **opts)
     args = tool_call.function.arguments
     edit = !!args.edit
-    text = args.text.full?
+    text = args.text.full? or raise OllamaChat::ToolFunctionArgumentError, 'no text given'
 
     chat = opts[:chat]
     chat.perform_copy_to_clipboard(text:, content: true, edit:)
 
-    message =
-      if text.nil?
-        "The last response has been successfully copied to the system clipboard."
-      else
-        "The provided text has been successfully copied to the system clipboard."
-      end
+    message = "The provided text has been successfully copied to the system clipboard."
 
     {
       success:  true,

data/lib/ollama_chat/tools/directory_structure.rb

@@ -29,7 +29,9 @@ class OllamaChat::Tools::DirectoryStructure
           Tree viewer – Returns JSON describing files/folders under path up to
           max_depth (<= height of the tree), optionally only files ending with
           suffix, e. g. rb for ruby files. Handy for locating resources or
-          presenting a project layout.
+          presenting a project layout. Limit the required tokens by using the
+          max_depth parameter if possible, because the number of nodes in a
+          tree can grow exponentially with its height.
         EOT
         parameters: Tool::Function::Parameters.new(
           type: 'object',

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.97'
+  VERSION         = '0.0.99'
   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.97 ruby lib
+# stub: ollama_chat 0.0.99 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.97".freeze
+  s.version = "0.0.99".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/chat_spec.rb

@@ -15,7 +15,7 @@ describe OllamaChat::Chat, protect_env: true do
   end
 
   let :chat do
-    OllamaChat::Chat.new(argv: argv).expose
+    OllamaChat::Chat.new(argv:).expose
   end
 
   describe 'instantiation' do

data/spec/ollama_chat/history_spec.rb

@@ -4,7 +4,7 @@ describe OllamaChat::History do
   end
 
   let :chat do
-    OllamaChat::Chat.new(argv: argv).expose
+    OllamaChat::Chat.new(argv:).expose
   end
 
   connect_to_ollama_server(instantiate: false)

data/spec/ollama_chat/tools/copy_to_clipboard_spec.rb

@@ -17,7 +17,7 @@ describe OllamaChat::Tools::CopyToClipboard do
     expect(described_class.new.to_hash).to be_a Hash
   end
 
-  it 'can be executed successfully without provided text' do
+  it 'raises an error if no text is provided' do
     tool_call = double(
       'ToolCall',
       function: double(
@@ -29,17 +29,13 @@ describe OllamaChat::Tools::CopyToClipboard do
       )
     )
 
-    # Test that perform_copy_to_clipboard is called with content: true
-    expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: false)
-
     result = described_class.new.execute(tool_call, chat:)
 
     # Should return valid JSON
     expect(result).to be_a(String)
     json = json_object(result)
-    expect(json.error).to be_nil # No exception was raised
-    expect(json.success).to be true
-    expect(json.message).to eq 'The last response has been successfully copied to the system clipboard.'
+    expect(json.error).to eq 'OllamaChat::ToolFunctionArgumentError'
+    expect(json.message).to eq 'no text given'
   end
 
   it 'can copy custom text to the clipboard' do
@@ -70,19 +66,20 @@ describe OllamaChat::Tools::CopyToClipboard do
   end
 
   it 'can be executed with edit option' do
+    text = 'Text to edit'
     tool_call = double(
       'ToolCall',
       function: double(
         name: 'copy_to_clipboard',
         arguments: double(
-          text: nil,
+          text: ,
           edit: true
         )
       )
     )
 
     # Test that perform_copy_to_clipboard is called with edit: true
-    expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: true)
+    expect(chat).to receive(:perform_copy_to_clipboard).with(text:, content: true, edit: true)
 
     result = described_class.new.execute(tool_call, chat:)
 
@@ -91,23 +88,24 @@ describe OllamaChat::Tools::CopyToClipboard do
     json = json_object(result)
     expect(json.error).to be_nil
     expect(json.success).to be true
-    expect(json.message).to eq 'The last response has been successfully copied to the system clipboard.'
+    expect(json.message).to eq 'The provided text has been successfully copied to the system clipboard.'
   end
 
   it 'can handle execution errors gracefully' do
+    text = 'Error triggering text'
     tool_call = double(
       'ToolCall',
       function: double(
         name: 'copy_to_clipboard',
         arguments: double(
-          text: nil,
+          text: ,
           edit: nil
         )
       )
     )
 
     # Test that perform_copy_to_clipboard raises an error
-    expect(chat).to receive(:perform_copy_to_clipboard).with(text:nil, content: true, edit: false).
+    expect(chat).to receive(:perform_copy_to_clipboard).with(text:, content: true, edit: false).
       and_raise(OllamaChat::OllamaChatError, 'No response available to copy to the system clipboard.')
 
     result = described_class.new.execute(tool_call, chat:)
@@ -120,19 +118,20 @@ describe OllamaChat::Tools::CopyToClipboard do
   end
 
   it 'can handle execution exceptions gracefully' do
+    text = 'Exception triggering text'
     tool_call = double(
       'ToolCall',
       function: double(
         name: 'copy_to_clipboard',
         arguments: double(
-          text: nil,
+          text: ,
           edit: nil
         )
       )
     )
 
     # Test that perform_copy_to_clipboard raises an exception
-    expect(chat).to receive(:perform_copy_to_clipboard).with(text: nil, content: true, edit: false).
+    expect(chat).to receive(:perform_copy_to_clipboard).with(text:, content: true, edit: false).
       and_raise(RuntimeError, 'some kind of exception')
 
     result = described_class.new.execute(tool_call, chat:)

data/spec/ollama_chat/tools/execute_ri_spec.rb

@@ -31,7 +31,7 @@ describe OllamaChat::Tools::ExecuteRI do
         'ToolCall',
         function: double(
           name: 'execute_ri',
-          arguments: double(topic: topic)
+          arguments: double(topic:)
         )
       )
 

data/spec/ollama_chat/tools/get_url_spec.rb

@@ -104,7 +104,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "ignoring" policy' do
-      args = double(url: url, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -113,7 +113,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "importing" policy' do
-      args = double(url: url, document_policy: 'importing')
+      args = double(url:, document_policy: 'importing')
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:import_source).with(source_io, URI.parse(url)).and_return('imported content')
 
@@ -123,7 +123,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "embedding" policy' do
-      args = double(url: url, document_policy: 'embedding')
+      args = double(url:, document_policy: 'embedding')
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:embed_source).with(source_io, URI.parse(url)).and_return('embedded content')
 
@@ -133,7 +133,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "summarizing" policy' do
-      args = double(url: url, document_policy: 'summarizing')
+      args = double(url:, document_policy: 'summarizing')
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:summarize_source).with(source_io, URI.parse(url)).and_return('summarized content')
 
@@ -143,7 +143,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles an invalid policy' do
-      args = double(url: url, document_policy: 'chaos_mode')
+      args = double(url:, document_policy: 'chaos_mode')
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -160,7 +160,7 @@ describe OllamaChat::Tools::GetURL do
       allow(chat).to receive(:fetch_source).and_yield(source_io)
       expect(chat).to receive(:add_image).with(chat.images, source_io, URI.parse(url))
 
-      args = double(url: url, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -172,7 +172,7 @@ describe OllamaChat::Tools::GetURL do
       source_io = double('SourceIO', content_type: double(media_type: 'video'))
       allow(chat).to receive(:fetch_source).and_yield(source_io)
 
-      args = double(url: url, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring')
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)

metadata

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