openclacky 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1d065edf333a21a538aff43effdcefbc1cb9fa9a3c816d2da3943418f502fb
-  data.tar.gz: d891f1b03ff43bcd237eb510990b74145522404dd4fa3b2bc4b3741f3e495a32
+  metadata.gz: 52ab39c40c69d821b45d01ed1d14086a50446309421891e9cd6724a9b32864cf
+  data.tar.gz: 0d61ef02a23f8a04157f8b7b2308a4f0c68fd37bba1407894b9841cd707c6873
 SHA512:
-  metadata.gz: 5190473333b6c0259ee7ec76bf3127986b03fcbbaeba8face1e0f5bd5ebc60d40b9937df7ef129737eb6364789a214a515970728cfd71b80770cc671e5440004
-  data.tar.gz: 0a7858fe351e34810bca0b28ab91b3974041758608fe8c446e6f0c555402c990418bb6d3bc4ac071fe61fe3d881a5c190f191258287541b57508a940c2643752
+  metadata.gz: d654bd29a093bf23f1e0c162867251e08a28ec722deaae7a9d234f2aed913329d991df29391778612c458c51b6775881ee0867cb2d959c0f7072b14e662d0c38
+  data.tar.gz: 8056dff60d1c845751021e2c852e58071360c8d6a6b81cec72be238e647521ae36a211d72af88602239f8abcab5a15b7a345b8efd98e68b62a0a6dfde8a63b23

data/lib/clacky/agent.rb

@@ -2,7 +2,7 @@
 
 require "securerandom"
 require "json"
-require "readline"
+require "tty-prompt"
 require "set"
 require_relative "utils/arguments_parser"
 
@@ -97,7 +97,7 @@ module Clacky
       @working_dir = session_data[:working_dir]
       @created_at = session_data[:created_at]
       @total_tasks = session_data.dig(:stats, :total_tasks) || 0
-      
+
       # Restore cache statistics if available
       @cache_stats = session_data.dig(:stats, :cache_stats) || {
         cache_creation_input_tokens: 0,
@@ -138,12 +138,12 @@ module Clacky
       if @messages.empty?
         system_prompt = build_system_prompt
         system_message = { role: "system", content: system_prompt }
-        
+
         # Enable caching for system prompt if configured and model supports it
         if @config.enable_prompt_caching
           system_message[:cache_control] = { type: "ephemeral" }
         end
-        
+
         @messages << system_message
       end
 
@@ -616,14 +616,14 @@ module Clacky
       input_cost = (usage[:prompt_tokens] / 1_000_000.0) * PRICING[:input]
       output_cost = (usage[:completion_tokens] / 1_000_000.0) * PRICING[:output]
       @total_cost += input_cost + output_cost
-      
+
       # Track cache usage statistics
       @cache_stats[:total_requests] += 1
-      
+
       if usage[:cache_creation_input_tokens]
         @cache_stats[:cache_creation_input_tokens] += usage[:cache_creation_input_tokens]
       end
-      
+
       if usage[:cache_read_input_tokens]
         @cache_stats[:cache_read_input_tokens] += usage[:cache_read_input_tokens]
         @cache_stats[:cache_hit_requests] += 1
@@ -669,12 +669,12 @@ module Clacky
         # Rebuild messages array: [system, summary, recent_messages]
         # Preserve cache_control on system message if it exists
         rebuilt_messages = [system_msg, summary, *recent_messages].compact
-        
+
         # Re-apply cache control to system message if caching is enabled
         if @config.enable_prompt_caching && rebuilt_messages.first&.dig(:role) == "system"
           rebuilt_messages.first[:cache_control] = { type: "ephemeral" }
         end
-        
+
         @messages = rebuilt_messages
 
         final_size = @messages.size
@@ -703,7 +703,7 @@ module Clacky
 
       # Track which messages to include
       messages_to_include = Set.new
-      
+
       # Start from the end and work backwards
       i = messages.size - 1
       messages_collected = 0
@@ -724,13 +724,13 @@ module Clacky
         # If this is an assistant message with tool_calls, we MUST include ALL corresponding tool results
         if msg[:role] == "assistant" && msg[:tool_calls]
           tool_call_ids = msg[:tool_calls].map { |tc| tc[:id] }
-          
+
           # Find all tool results that belong to this assistant message
           # They should be in the messages immediately following this assistant message
           j = i + 1
           while j < messages.size
             next_msg = messages[j]
-            
+
             # If we find a tool result for one of our tool_calls, include it
             if next_msg[:role] == "tool" && tool_call_ids.include?(next_msg[:tool_call_id])
               messages_to_include.add(j)
@@ -738,7 +738,7 @@ module Clacky
               # Stop when we hit a non-tool message (start of next turn)
               break
             end
-            
+
             j += 1
           end
         end
@@ -859,18 +859,28 @@ module Clacky
       prompt_text = format_tool_prompt(call)
       puts "\n❓ #{prompt_text}"
 
-      # Use Readline for better input handling (backspace, arrow keys, etc.)
-      response = Readline.readline("   (Enter/y to approve, n to deny, or provide feedback): ", true)
+      # Use TTY::Prompt for better input handling
+      tty_prompt = TTY::Prompt.new(interrupt: :exit)
 
-      if response.nil?  # Handle EOF/pipe input
+      begin
+        response = tty_prompt.ask("   (Enter/y to approve, n to deny, or provide feedback):", required: false) do |q|
+          q.modify :strip
+        end
+      rescue TTY::Reader::InputInterrupt
+        # Handle Ctrl+C
+        puts
         return { approved: false, feedback: nil }
       end
 
-      response = response.chomp
+      # Handle nil response (EOF/pipe input)
+      if response.nil? || response.empty?
+        return { approved: true, feedback: nil }  # Empty means approved
+      end
+
       response_lower = response.downcase
 
-      # Empty response (just Enter) or "y"/"yes" = approved
-      if response.empty? || response_lower == "y" || response_lower == "yes"
+      # "y"/"yes" = approved
+      if response_lower == "y" || response_lower == "yes"
         return { approved: true, feedback: nil }
       end
 

data/lib/clacky/cli.rb

@@ -3,7 +3,6 @@
 require "thor"
 require "tty-prompt"
 require "tty-spinner"
-require "readline"
 require_relative "ui/banner"
 require_relative "ui/prompt"
 require_relative "ui/statusbar"
@@ -414,7 +413,7 @@ module Clacky
 
             break if current_message.nil? || %w[exit quit].include?(current_message&.downcase&.strip)
             next if current_message.strip.empty?
-            
+
             # Display user's message after input
             ui_formatter.user_message(current_message)
           end
@@ -657,12 +656,23 @@ module Clacky
         base_url: config.base_url
       )
 
+      # Use TTY::Prompt for input
+      tty_prompt = TTY::Prompt.new(interrupt: :exit)
+
       loop do
-        # Use Readline for better Unicode/CJK support
-        message = Readline.readline("You: ", true)
+        # Use TTY::Prompt for better input handling
+        begin
+          message = tty_prompt.ask("You:", required: false) do |q|
+            q.modify :strip
+          end
+        rescue TTY::Reader::InputInterrupt
+          # Handle Ctrl+C
+          puts
+          break
+        end
 
-        break if message.nil? || %w[exit quit].include?(message.downcase.strip)
-        next if message.strip.empty?
+        break if message.nil? || %w[exit quit].include?(message&.downcase&.strip)
+        next if message.nil? || message.strip.empty?
 
         spinner = TTY::Spinner.new("[:spinner] Claude is thinking...", format: :dots)
         spinner.auto_spin

data/lib/clacky/progress_indicator.rb

@@ -49,6 +49,7 @@ module Clacky
       print "\e[u"     # Restore cursor position (to after [..] symbol)
       print "\e[K"     # Clear to end of line from cursor
       print text
+      print " "
       $stdout.flush
     end
   end

data/lib/clacky/ui/prompt.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "readline"
+require "tty-prompt"
 require "pastel"
 require "tty-screen"
 
@@ -10,11 +10,12 @@ module Clacky
     class Prompt
       def initialize
         @pastel = Pastel.new
+        @tty_prompt = TTY::Prompt.new(interrupt: :exit)
       end
 
       # Read user input with enhanced prompt box
       # @param prefix [String] Prompt prefix (default: "You:")
-      # @param placeholder [String] Placeholder text (not shown when using Readline)
+      # @param placeholder [String] Placeholder text (not shown when using TTY::Prompt)
       # @return [String, nil] User input or nil on EOF
       def read_input(prefix: "You:", placeholder: nil)
         width = [TTY::Screen.width - 5, 70].min
@@ -22,9 +23,9 @@ module Clacky
         # Display complete box frame first
         puts @pastel.dim("╭" + "─" * width + "╮")
 
-        # Empty input line with borders (width - 2 for left/right padding)
-        padding = " " * (width - 2)
-        puts @pastel.dim("│ #{padding} │")
+        # Empty input line - NO left border, just spaces and right border
+        padding = " " * width
+        puts @pastel.dim("#{padding} │")
 
         # Bottom border
         puts @pastel.dim("╰" + "─" * width + "╯")
@@ -32,36 +33,37 @@ module Clacky
         # Move cursor back up to input line (2 lines up)
         print "\e[2A"  # Move up 2 lines
         print "\r"     # Move to beginning of line
-        print "\e[2C"  # Move right 2 chars to after "│ "
 
-        # Read input with Readline
-        prompt_text = @pastel.bright_blue("#{prefix} ")
-        input = read_with_readline(prompt_text)
+        # Read input with TTY::Prompt
+        prompt_text = @pastel.bright_blue("#{prefix}")
+        input = read_with_tty_prompt(prompt_text)
 
         # After input, clear the input box completely
         # Move cursor up 2 lines to the top of the box
         print "\e[2A"
         print "\r"
-        
+
         # Clear all 3 lines of the box
         3.times do
           print "\e[2K"  # Clear entire line
           print "\e[1B"  # Move down 1 line
           print "\r"     # Move to beginning of line
         end
-        
+
         # Move cursor back up to where the box started
         print "\e[3A"
         print "\r"
-        
+
         input
       end
 
       private
 
-      def read_with_readline(prompt)
-        Readline.readline(prompt, true)
-      rescue Interrupt
+      def read_with_tty_prompt(prompt)
+        @tty_prompt.ask(prompt, required: false, echo: true) do |q|
+          q.modify :strip
+        end
+      rescue TTY::Reader::InputInterrupt
         puts
         nil
       end

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - windy